Repaired bad macro expressions.