Port of scalaz 6.0.4 geo to the new scalaz 7.0.0