Streamlined the autoloader.