Upgrade Scalaz 7.0.0-M8
Minor clean up: use collect