escalate private methods/variables to be public

Generally better for testing, and some private variables needed to
become public anyway to escape being static/instance-shared variables.