My last comment was based on incorrect assumptions.  It turns out that the 2i timeout is fed into the coverage FSM.  I.e. the 2i timeout is used to set the coverage timeout and that is what determines the time a 2i query has to finish.

That said, I would like to heard more next week @evanmcc.