make some more things package-private