Improve highlighting of function calls