Minor simplifications on the compilation side.