Make export/export_type statements coherent