I can clean these up as part of the patch that drops OpenJPEG 1.x support, which I plan on making after the next release (though of course someone else is welcome to beat me to it; it seems there's a race for OpenJPEG patches!).