MOAR Refactoring.