[_andrei_]

Shouldn't be hard to do both things, will def. add that. Part of the plan is to switch to Tree-sitter and use other languages as well.