These variables all end with "_", most likely the original intention is that they are not official and may be removed or changed at any time. By making them official, we lock in that ABI. Is that your intention? (likewise your other patch).