change unnaply return types. use Some instead of Option if possible

core/src/main/scala/scalaz/Cofree.scala

@@ -83,7 +83,7 @@ object Cofree extends CofreeInstances {
 
   def delay[S[_], A](h: A, t: => S[Cofree[S, A]]): Cofree[S,A] = applyT(h, Trampoline.delay(t))
 
-  def unapply[S[_], A](c: Cofree[S, A]): Option[(A, S[Cofree[S,A]])] = Some( (c.head, c.tail) )
+  def unapply[S[_], A](c: Cofree[S, A]): Some[(A, S[Cofree[S,A]])] = Some( (c.head, c.tail) )
 
   //creates an instance of Cofree that trampolines all of the calls to the tail so we get stack safety
   def applyT[S[_],A](a: A, tf: Free[Function0,S[Cofree[S,A]]])(implicit T: Functor[λ[a => Free[Function0, a]]]): Cofree[S, A] =

core/src/main/scala/scalaz/Name.scala

@@ -23,7 +23,7 @@ object Name {
   def apply[A](a: => A): Name[A] = new Name[A] {
     def value = a
   }
-  def unapply[A](v: Name[A]): Option[A] = Some(v.value)
+  def unapply[A](v: Name[A]): Some[A] = Some(v.value)
 
   implicit val name: Monad[Name] with BindRec[Name] with Comonad[Name] with Distributive[Name] with Traverse1[Name] with Zip[Name] with Unzip[Name] with Align[Name] with Cozip[Name] =
     new Monad[Name] with BindRec[Name] with Comonad[Name] with Distributive[Name] with Traverse1[Name] with Zip[Name] with Unzip[Name] with Align[Name] with Cozip[Name] {
@@ -62,7 +62,7 @@ object Name {
 object Need {
   def apply[A](a: => A): Need[A] = new Need(() => a)
 
-  def unapply[A](x: Need[A]): Option[A] = Some(x.value)
+  def unapply[A](x: Need[A]): Some[A] = Some(x.value)
 
   implicit val need: Monad[Need] with BindRec[Need] with Comonad[Need] with Distributive[Need] with Traverse1[Need] with Zip[Need] with Unzip[Need] with Align[Need] with Cozip[Need] =
     new Monad[Need] with BindRec[Need] with Comonad[Need] with Distributive[Need] with Traverse1[Need] with Zip[Need] with Unzip[Need] with Align[Need] with Cozip[Need] {

core/src/main/scala/scalaz/NonEmptyList.scala

@@ -152,7 +152,7 @@ object NonEmptyList extends NonEmptyListInstances {
   def fromSeq[A](h: A, t: Seq[A]): NonEmptyList[A] =
     nel(h, IList.fromSeq(t))
 
-  def unapply[A](v: NonEmptyList[A]): Option[(A, IList[A])] =
+  def unapply[A](v: NonEmptyList[A]): Some[(A, IList[A])] =
     Some((v.head, v.tail))
 
   def nel[A](h: A, t: IList[A]): NonEmptyList[A] =

core/src/main/scala/scalaz/StrictTree.scala

@@ -256,7 +256,7 @@ object StrictTree extends StrictTreeInstances {
       StrictTree[A](root, forest)
     }
 
-    def unapply[A](t: StrictTree[A]): Option[(A, Vector[StrictTree[A]])] = Some((t.rootLabel, t.subForest))
+    def unapply[A](t: StrictTree[A]): Some[(A, Vector[StrictTree[A]])] = Some((t.rootLabel, t.subForest))
   }
 
   /**

core/src/main/scala/scalaz/Tag.scala

@@ -80,7 +80,7 @@ object Tag {
     def unsubst[F[_], A](fa: F[A @@ T]): F[A] = Tag.unsubst(fa)
 
     /** Pattern match on a tagged value */
-    def unapply[A](a: A @@ T): Option[A] = Some(unwrap(a))
+    def unapply[A](a: A @@ T): Some[A] = Some(unwrap(a))
   }
 
   /** Variants of `apply`, `subst`, and `unsubst` that require

core/src/main/scala/scalaz/Tree.scala

@@ -245,7 +245,7 @@ object Tree extends TreeInstances {
       }
     }
 
-    def unapply[A](t: Tree[A]): Option[(A, EStream[Tree[A]])] = Some((t.rootLabel, t.subForest))
+    def unapply[A](t: Tree[A]): Some[(A, EStream[Tree[A]])] = Some((t.rootLabel, t.subForest))
   }
 
   /**