Add some whitespace for readability
Make TR generate impersonator hash/c when appropriate

Not sure if this fix is ok in general for TR, but it's
a known bug that we should fix somehow.