which required a redundant check to see if a variable was defined rather than short circuiting. Fixes #4469