Patch more gracefully, so that this works with e.g. 2012Q4's ImageMagick too.