Upstream 6.10.9 does indeed seem to fix it. Half a dozen runs of my reproducers yielded nothing but correct behavior.