2 more micro-optimizations in CI_Loader