T3-1221 Switch to using macify instead of our own homebrew version.