match: also restore originally unset entries in recursion

[carenas]

Fixes: #261

[PhilipHazel]

Thank you for figuring out the solution to this issue. I have been poring over the code, trying to remember how it works, and failing to spot what was going on, mainly because I was looking too hard at the start of a recursion rather than the end. Doh!