Yet more beautification of 'CompilerManager'