Patch Set 2: I would prefer that you didn't submit this

(29 inline comments)

I'm really happy with this approach. I'm just down to style nits, and what appears to be a bug where you use milliseconds but document the timeout as seconds.