Also fixes them elsewhere, apart from having switched to a vendorized version, I also used one that is already namespaced.
The easy way out here is to use it in the namespaced fashion, it is only used in a few places and I know the library well enough to be certain that nothing much changed apart from the namespacing.
21a319767f