Update batch registration of fields based on feedback

Removed the contentious begin_add_form_fields() and end_add_form_fields(). Apparently the code "smelled" :)