runtime: integrate executor code into work

Too many subtleties, this is messier, but may work better.