Move more internal functions to private methods.