[minor] Extract a few map/reduce patterns.
Restore an error that I hid while debugging.
Fix a `merge` case that could toss req. fields.

Unfortunately, I’ve only seen this exhibited in `pending` tests that were failing differently than they should have been failing.
Merge pull request #262 from sellout/more-minor-fixes

More minor fixes