Updated for Scalaz 7 final