Remove some superfluous macros. They just hide the fact that they are
simple variables.