More refactoring on the CSS compiler.