Fix errors about new macro rules.