fix keyword matcher; test annotation quoting