Ideally none of these macros would exist (long-term goal), however in the meantime at least make sure expressions always evaluate correctly (thankfully no current usages rely on this).