Extract common code from Add/Edit Registrant to include. Misc cleanup.