Yeah, as I [said](https://github.com/geany/geany/pull/3175#issuecomment-1111544942) I'll leave that to you to sort out. In a separate PR and branch would be nice since it wouldn't need to be force pushed and should just apply and you can delete the messy branch.