No real changes, just make it possibly to add more fields to the private struct in the future without affecting the ABI. This commit is best viewed with git --color-moved --color-moved-ws=ignore-all-space options.