Tweaks to result handling to make things a little more sane.