[#47380499] Clean up cancelable_query statements left after streaming.  Expand test coverage.