Fold more stuff into the Compiler struct