This series fixes some regressions introduced by the send-from-grf merge. Possibly none of them show up with piglit master, but they cause extreme breakage in my gs5-gather piglit branch.