Moved more stuff into autoloads.