I noticed that there were a few variables that should not be visible per default.
It seems to me to simply be an oversight, so I went ahead and cleaned them up.
I think these changes should be fine and not change anything.
But I wanted to pass it by the platform maintainers so I don't sneak this in.