Merge "Simplified intrinsic macro mechanism."