2 files changed, 8 insertions, 17 deletions

diff --git a/prototypes/TCReduce.hs b/prototypes/TCReduce.hs
index 269d4d0f..e74b58e0 100644
--- a/prototypes/TCReduce.hs
+++ b/prototypes/TCReduce.hs
@@ -564,7 +564,6 @@ evv = \case
     Snd -> \(_, x) -> x
     NY (evv1 -> a) Fst -> \(x, _) -> a x
 
-    Skip (Init (T2 Snd)) -> \a0 a1 -> a1
     Skip (Init (T2 (evv -> x))) -> \a0 a1 -> x ((), a1)
     Skip Id -> \_ x -> x
     Skip (evv -> x) -> \_ -> x
@@ -661,6 +660,9 @@ Id `ny` x = x
 x `ny` Id = x
 x `ny` y = NY x y
 
+init' (T2 Snd) = Id
+init' x = Init x
+
 --------------------------------------------------------------------------------
 
 uGV :: GV a -> GV b
@@ -703,7 +705,7 @@ evva_ ss = \case
     z@(getLams -> Just (i, x))
         | b -> Skip $ case i of
             False -> uGV evva'x
-            True  -> uGV $ Init $ T2 $ uGV evva'x
+            True  -> uGV $ init' $ T2 $ uGV evva'x
         | otherwise -> case i of
             False -> uGV $ SkipYN $ uGV evva'x
             True  -> uGV $ T2 $ uGV evva'x
@@ -742,8 +744,8 @@ evval ((x, _), ty) = (uGV y, tr ty $ evv y)
     y = init' $ uGV $ evva_ [] x
     tr (VCon (TConName Int _ _ _ _ _) _) x = VInt (unsafeCoerce x :: Int)
 
-init' :: GV (() -> b) -> GV b
-init' (Skip x) = x
+    init' :: GV (() -> b) -> GV b
+    init' (Skip x) = x
 
 -------------------------------------------------------------------------------- interpreter
 
diff --git a/prototypes/primes.lam b/prototypes/primes.lam
index f0b7a6b5..c652bbd7 100644
--- a/prototypes/primes.lam
+++ b/prototypes/primes.lam
@@ -91,23 +91,12 @@ let tail =
   :: forall {a :: *} . List a -> List a
 
 let nth =
-  (\a -> fix (Int -> List a -> a) (\f n xs ->
-    listCase a (\ _ -> a)
-        (undefined a)
-        (\ x xs -> boolCase (\ _ -> a)
-                     (f (primSub n #1) xs)
-                     x
-                     (primIntEq #0 n))
-        xs))
-  :: forall {a :: *} . Int -> List a -> a
-{-
-let nth =
   (\a -> fix (Int -> List a -> a) (\f n xs -> boolCase (\ _ -> a)
-                     (f (primSub n #1) (tail a xs))
+                     (listCase a (\ _ -> a) (undefined a) (\x xs -> f (primSub n #1) xs) xs)
                      (head a xs)
                      (primIntEq #0 n)))
   :: forall {a :: *} . Int -> List a -> a
--}
+
 let takeWhile =
   (\a p -> fix (List a -> List a) (\tw -> listCase a (\ _ -> List a) (Nil a)
         (\x xs -> boolCase (\ _ -> List a)