bundle source next/close/interrupt edge cases

jar from perfect, but hopefully sufficient to go back to being
(a bit less) mildly annoying rather than a test-breaking problem.