Minor changes if mod_form for consistency.
Also trying to work around MDL-38315