Merge "Tidy some uses of IsCompilationEnabled."