- Changing huge 'match's to 'any-of's
- Roughly organising the queries into sections
- Add some TODOs for more improvements
- Comment out def-like and call queries as they overlap too much
- Change the captures to use better (imo) groups
- Make with-.* and when-.* always highlight like a builtin