Really fix circular status deferreds.

The previous fix didn't work, but I figured out how to reproduce in a test,
and came up with a real (if a bit annoying) fix.