Merge "Re-implement mma/mmma using make goals."