Remove dependence on comparediff