Issue #2332269 by davidwbarratt: Move form modifications into pre_render and process callbacks.