Fix highlighting of macro arguments