fix #429

And fix some other dangling issues with the recent form changes.