Revert "Don't define private internal vars"

This reverts commit fe2a42cba69cdb66cb4812db6e470e9237edc137.
Bump - close to release