Updates to form helpers

See my comments on the individual commits for more info.