updates to accommodate recent macro PRs into trunk