[Orc] Tidy up the CompileOnDemand layer based on commit review from dblaikie.