Refactoring until it compiles again.