Reorder hidden form elements for sanity.