Use proper thunk API, in turn fixing GC bug.