Make it build again.
Refactoring.