Jeffrey's latest -- reorder my chages somewhat,
removed some of his own cruft.  Added \g<...> references in replacement text.
1 file changed