repairs for `{impersonator,chaperone}-struct`

Commit 0b71b8481d didn't have the tests that I thought I had
written, and so the changes were unsurprisingly buggy.