Tentative fix to #205 and related, assuming issue is that stale callbacks are being executed.