Improve performance of macro processing with many macro refs
Merge pull request #174 from mballance-sf/master

Performance improvement for many macro refs