Cleanup from upstream with new build macros