Spruce up autoloading