we don't need to recur on state, especially since we can make it part of the closure now;
call-time is a bit ugly, but this is just temporary / transitional;