Begin work on Modern Patch Creation before break

I'm redoing the code in the same way I did Patch Extraction, by breaking
up the giant function and variable renames (which, again, throw-back to
pre-1.0 Stable days), so the code is broken right now.