Merge "Simplified intrinsic macro mechanism." am: e0d1855149
am: 5fad555637

* commit '5fad555637d1548ccebcdf3bdd0339bf3b77e44b':
  Simplified intrinsic macro mechanism.