Moved where the export list is generated for bug #8365.