Refactoring some Navigator methods.