Fix delegation

Handle the resolved-with-promise case correctly! Fixes the 3 broken tests.