More refactoring to the compiler.