Issue #2084343 by Mark Carver, valkum, Denes.Szabo, heylookalive: Form preprocessing needs to be refactored