Fixing ImageMagick 6.6/6.7 -> 6.8 incompatabilities