Merge "Simplified intrinsic macro mechanism."
am: e0d1855149

* commit 'e0d18551491619dba0d9846d9f8312c6d1e07bde':
  Simplified intrinsic macro mechanism.