Tweaked autoloaders. No functional change intended
Added TODO [ci skip]