Let's see if we've successfully cleared up all the bugs from last
time...
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>