Minor autoloader refactoring