Less unchecked optionals in submit.