Merge "Unify our assembler macros."