Fix Scalaz RC1 specific changes