Merge "Work around Mac assembler differences."