Can do that. Should it be part of this PR or a separate one after this one is merged?
Whichever you prefer. I'd have said this one given it'll introduce yet another set of changes that are probably best diffed from current master, but I don't really mind either way in practice, so if it's easier for you just do another one afterwards.
I just wanted to avoid rebasing this PR on top of another ctags version so I'd prefer a separate PR (which will be much smaller and easier to review).