Added defvars for some local variables to quiet byte-compiler