add a couple missing uses of esc() in macros in Base