Cleaning up 'CompilerManager' some more