Remove some package privacy so these things can be used in scalding and ...

...elsewhere directly