[COMMIT] Be more careful about what we shadow, #'byte-compile-eval.