more fixes to handle resolved thenables.