Clean up the forms for #823.