Work toward #849.

Also removes the condition causing the error in #846 but does not address the underlying problem with #846 in that a validation error on Add put the form in a bad state.