Fix for listenToOnce mem. leak

This is a failing test demonstrating #3226, then a patch that makes the test pass.
Wanna call it something shorter, like `cb` or `original`?