Simplify variable safety declaration
Simplify quoting in macros