More basic refactoring.