There were a few cases where fields that should have been marked optional
were not.  This was causing weird validation issues, but is now fixed.