More work on the form helpers