Merge change 3498

* changes:
  Move macros into their own table.