Merge "SpecialMovepage: Improve sanity of form-generating code"