These two lines, and the similar two lines in the OPandand are unrelated to the new expression rewrite, aren't they?  They're a bug fix and should have been there for ages, I suspect.  Assuming I'm write, please split into two commits.  The bug fix isn't even listed in the commit message, a problem all by itself.