Change one '#ifdef' to '#if defined()' for improved consistency within the file,
as in checkin [211aa43013].
[2486824] Improve error message; not all that upvars is an upvar.
[2486824] Improve error message; not all that upvars is an upvar.