Further refinements to CSV import and supporting upload form.