Add layer of macro-indirection to ensure macro arguments are expanded prior to stringification