Okay, I can see the change that is causing this. However, if I revert it, the previously reported issue will return. I have found an alternative fix that seems to resolve both issues but it is not clear how this would affect backward compatibility. I tested it with my 50+ if/while unit tests, and they all pass. I will include the change in the next beta to see how things go :-)
