Code cleanup for combine autoloader.