Improve rules for macro args.