OK, I have a commit for this and the complex / numerical case that reworks things to avoid declaring a variable in this way.