Wrapper is making finish() recurse infinitely, calling the wrong finish
etc
Mostly fixing wrapper to reenter only when it ought... a lot of
callbacks erroneously returning None