Applied #2990 and #2991 to Geany at https://github.com/geany/geany/commit/eabc09a5591e8f2efd95ca136f5870c8dcba54..., works for me.
`make check` passes, just a query, are there any more test files we can copy from ctags?
Also checked any filetypes I happened to have a source file lying around for, and knew enough to check what should be generated, none seem to have any different failures from a version of Geany before they were applied.
If nobody beats me or objects I'd be happy to push #2990 and #2991 in a week (or so).