Remove some special-case hacks that are no longer needed. Strip trailing whitespace.
Add fixup_vars, currently a no-op.
Weaken assertion around w:rFonts (crazy crazy Word)
Rev 23.