[MERGE] Deparse fixups.
authorDavid Mitchell <davem@iabyn.com>
Tue, 20 Mar 2018 09:28:23 +0000 (09:28 +0000)
committerDavid Mitchell <davem@iabyn.com>
Tue, 20 Mar 2018 09:28:23 +0000 (09:28 +0000)
Make
    ./TEST -deparse
pass again


Trivial merge