Fix macro typos from c85ba1