...and, some more refactoring.