wip: streamlining callback path

This only counts for a few percent of what I'll be able to get.