Consolidate extended rewrite preprocessing modes (#8156)