Commit 4b7e78153c47ae08420558e7e6d8b0bc2591039c

Brent Cook 2015-01-05T21:21:23

quoting and ensure old_*flags are restored before the 'else'