Turns out not so easy to resolve the match_codec_pref() changes with my own.
I had various constifying tweaks and had also moved it to another location.
This illustrates how I feel about it: I'm treading a bicycle against strong
headwinds, trying to pull a horse trailer over a hill, then, along comes a
friend on a trike and puts a stick through my front wheel :P
I'll get over it, but no more sticks please if possible.
~N