3.0 form checkbox

Part of #2267. Fix a few more tests, and some issues along the way.