Minor autoload cleanup.