Stash partial progress on form-validation refactoring.