Add support for yield yield

Expand the yield expression if needed/