resolved: split out check whether reply matches our question

      It's complicated enough, it deserves its own call.

(Also contains some unrelated whitespace, comment and assertion changes)