Tweak formatting of some form definitions.
I changed my mind partway through the conversion about how they should look...