Removing a little dead code and reducing the visibility of a lot of
internal stuff that really isn't useful on the API to clients.