Fixing up delegating yield