One more set of refactorings, to remove these methods from the public API of the class.