WIP: Fixes in JS for delegating yield