Some more refactoring (particularly VerbConjugator)