Tightened up the result parsing.