Remove a macro from helper code that I find difficult to read. The result is not perfect, but at least it's more visible what get's assigned to what.