This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.