Merge "Fix usage of literals within a macro."