Fixed exception spec
Fixed yield with scope
Unified Yield and YieldWithScope