Please don't put unrelated changes into an ongoing Pull Request.  I am happy to add more form helpers, but that should be a separate thing.