Minor simplifications to export