diff --git a/generic-maybe.cabal b/generic-maybe.cabal
--- a/generic-maybe.cabal
+++ b/generic-maybe.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                generic-maybe
-version:             0.1.1.0
+version:             0.2.0.0
 synopsis:            A generic version of Data.Maybe
 description:
  This module is a drop in replacement for 'Data.Maybe'. It generalizes
diff --git a/src/Generics/Maybe.hs b/src/Generics/Maybe.hs
--- a/src/Generics/Maybe.hs
+++ b/src/Generics/Maybe.hs
@@ -21,15 +21,14 @@
 {-# LANGUAGE TypeOperators          #-}
 {-# LANGUAGE LambdaCase             #-}
 {-# LANGUAGE TypeFamilies           #-}
-{-# LANGUAGE ConstraintKinds        #-}
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE TypeSynonymInstances   #-}
 {-# LANGUAGE FlexibleInstances      #-}
 {-# LANGUAGE FlexibleContexts       #-}
 {-# LANGUAGE FunctionalDependencies #-}
+{-# LANGUAGE ScopedTypeVariables    #-}
 module Generics.Maybe 
-   ( MaybeLike
-   , fromMaybe
+   ( fromMaybe
    , maybe
    , isJust
    , isNothing
@@ -39,7 +38,7 @@
    , catMaybes
    , mapMaybe
    -- * Exported for groking, but not for implementing.
-   , GMaybeLike
+   , MaybeLike
    , G
    ) where
 import GHC.Generics
@@ -63,13 +62,6 @@
 -- >>> data Nat = Zero | Succ Nat deriving (Show, Generic)
 -- >>> data Result a = Success a | Fail deriving (Show, Generic)
 
--- | A constraint synonym to make the type signatures look better.
---   The 'd u m b y' type variables can be ignored.
-type MaybeLike maybe a d u m b y = 
-   ( Generic maybe
-   , GMaybeLike (Rep maybe) (G d u m b y a)
-   )
-
 -- | A generalized version of 'Data.Maybe.fromMaybe'
 --
 -- > fromMaybe :: a -> Maybe a -> Maybe a
@@ -91,7 +83,7 @@
 -- 
 -- >>> fromMaybe Zero $ Succ (Succ Zero)
 -- Succ Zero
-fromMaybe :: MaybeLike maybe a d u m b y
+fromMaybe :: (Generic maybe, MaybeLike (Rep maybe) a)
           => a -> maybe -> a
 fromMaybe x = fromMaybe' x . view gsimple 
 
@@ -99,8 +91,8 @@
            -> (U1 :+: Rec0 a) b
            -> a
 fromMaybe' def = \case 
-   L1 U1 -> def
-   R1 (K1 x)     -> x 
+   L1 U1     -> def
+   R1 (K1 x) -> x 
 -- | A generalized version of 'Data.Maybe.maybe' 
 --
 -- > maybe :: b -> (a -> b) -> Maybe a -> Maybe b
@@ -122,7 +114,7 @@
 --
 -- >>> maybe (Succ Zero) Succ $ Succ (Succ Zero)
 -- Succ (Succ Zero)
-maybe :: MaybeLike maybe a d u m b' y
+maybe :: (Generic maybe, MaybeLike (Rep maybe) a)
       => b -> (a -> b) -> maybe -> b
 maybe def f = maybe' def f . view gsimple
       
@@ -152,9 +144,10 @@
 -- 
 -- >>> isJust $ Succ Zero
 -- True
-isJust :: MaybeLike maybe a d u m b y
+isJust :: forall maybe a. 
+          (Generic maybe, MaybeLike (Rep maybe) a)
        => maybe -> Bool
-isJust = isJust' . view gsimple
+isJust = isJust' . view (gsimple :: Iso' maybe ((U1 :+: Rec0 a) p))
 
 isJust' :: (U1 :+: Rec0 a) b -> Bool
 isJust' = \case
@@ -182,9 +175,10 @@
 -- 
 -- >>> isNothing $ Succ Zero
 -- False
-isNothing :: MaybeLike maybe a d u m b y
+isNothing :: forall maybe a.
+             (Generic maybe, MaybeLike (Rep maybe) a)
           => maybe -> Bool   
-isNothing = isNothing' . view gsimple
+isNothing = isNothing' . view (gsimple :: Iso' maybe ((U1 :+: Rec0 a) p))
    
 isNothing' :: (U1 :+: Rec0 a) b -> Bool
 isNothing' = \case
@@ -212,7 +206,7 @@
 --
 -- >>> fromJust $ Succ Zero
 -- Zero
-fromJust :: MaybeLike maybe a d u m b y
+fromJust :: (Generic maybe, MaybeLike (Rep maybe) a)
          => maybe -> a   
 fromJust = fromJust' . view gsimple
    
@@ -241,7 +235,7 @@
 --
 -- >>> listToMaybe [] :: Nat
 -- Zero
-listToMaybe :: MaybeLike maybe a d u m b y
+listToMaybe :: (Generic maybe, MaybeLike (Rep maybe) a)
             => [a] -> maybe
 listToMaybe = view (Iso.from gsimple) . listToMaybe' 
    
@@ -271,7 +265,7 @@
 -- 
 -- >>> maybeToList Zero
 -- []
-maybeToList :: MaybeLike maybe a d u m b y
+maybeToList :: (Generic maybe, MaybeLike (Rep maybe) a)
             => maybe -> [a]
 maybeToList = maybeToList' . view gsimple
 
@@ -292,7 +286,7 @@
 --
 -- >>> catMaybes [Succ Zero, Zero, Succ Zero]
 -- [Zero,Zero]
-catMaybes :: MaybeLike maybe a d u m b y
+catMaybes :: (Generic maybe, MaybeLike (Rep maybe) a)
           => [maybe] -> [a]
 catMaybes = catMaybes' . map (view gsimple) 
 
@@ -311,8 +305,8 @@
 -- 
 -- >>> mapMaybe (\x -> if x then Succ Zero else Zero) [True, False, True]
 -- [Zero,Zero]
-mapMaybe :: MaybeLike maybe a' d u m b y
-         => (a -> maybe) -> [a] -> [a']
+mapMaybe :: (Generic maybe, MaybeLike (Rep maybe) b)
+         => (a -> maybe) -> [a] -> [b]
 mapMaybe f = mapMaybe' (view gsimple . f) 
 
 mapMaybe' :: (a -> (U1 :+: Rec0 b) x) -> [a] -> [b]
@@ -338,34 +332,19 @@
 commuteSum = \case 
    L1 x -> R1 x
    R1 x -> L1 x
-
--- | This type class is used to swap the order of constructors so
---   unit shows up first.
---
--- > (M1 m a (C1 b (S1 e (Rec0 any)) :+: C1 y U1)) 
---
--- will become
--- 
--- > (M1 m a (C1 y U1 :+: C1 b (S1 e (Rec0 any))))
--- 
---   and
--- 
--- > (M1 m a (C1 y U1 :+: C1 b (S1 e (Rec0 any))))
--- 
--- is unchanged
--- 
--- Thus, there are only two instances and should only be, forever
--- and always ... I think.
-class GMaybeLike f g | f -> g where
-   gmaybelike :: Iso' (f p) (g p)
-   
-instance GMaybeLike (G m a y b e any) (G m a y b e any) where
-   gmaybelike = iso id id 
+      
+-- | This class is used internally to get the GHC.Generic Rep into 
+--   a uniform form.
+--   There are only two instances and no more should be made
+class MaybeLike rep any | rep -> any where
+  maybelike :: Iso' (rep p) ((U1 :+: Rec0 any) p)
+      
+instance MaybeLike (G m a y b e any) any  where
+  maybelike = clean
 
--- commute :+: 
-instance GMaybeLike (M1 m a (C1 b (S1 e (Rec0 any)) :+: C1 y U1)) 
-                    (G m a y b e any) where
-   gmaybelike = iso invo invo where
+instance MaybeLike (M1 m a (C1 b (S1 e (Rec0 any)) :+: C1 y U1)) any where
+  maybelike = iso invo invo . clean
+    where
       invo = over m1 commuteSum
 
 -- Get rid of all the meta info
@@ -383,7 +362,7 @@
 
 -- Convert to the simplified generic form
 gsimple :: ( Generic maybe
-           , GMaybeLike (Rep maybe) (G m a y b e any)
+           , MaybeLike (Rep maybe) any
            )
         => Iso' maybe ((U1 :+: Rec0 any) p)
-gsimple = generic . gmaybelike . clean 
+gsimple = generic . maybelike