Fix highlighting of macro arguments

BUG:
![file](https://cloud.githubusercontent.com/assets/6377788/5500630/83c0f796-8783-11e4-8312-310e7731d805.jpg)