Remove some form-handling DRY violations