COMP: imperfect ITKv4 fixes