Compiler is almost back to normal after refactor.