Simplify AuxData access with a macro.
merge-mark