More refactoring tricks.