Fix commits from yesterday related to double forms.