Preserve cell vars across yields.
Add test case for cell variables/yield interactions.