Adjust the form templates to the new whitespace policy