> I find that the CLI is directly useful for end users to perform queries on their code

That's interesting; what do they use the results for?

> I have found that the grammars are relatively hard to make small modifications or extensions to

Definitely true. I think this may be an inherent problem of the system and the parser generation, though. I am not sure it's solvable by the grammar authors.