Minor accessibility refactoring.