Some more MacroAssemblerCompat cleanups.