Revision 1773803

Merge r1773162 from trunk:

After eliminating unusual whitespace in Unsafe mode (e.g. \f \v), we are left
with the same behavior in both of these cases. Simplify. Noted by rpluem.


Submitted by: wrowe
Reviewed/backported by: jim