@@ -101,7 +101,6 @@ import Control.Monad.Trans (MonadTrans (lift))
 import Control.Monad.Trans.Maybe (MaybeT (MaybeT), runMaybeT)
 import Control.Monad.Writer (MonadWriter, WriterT, runWriterT)
 import qualified Control.Monad.Writer as Writer
-import Data.Bifoldable (bifoldMap)
 import Data.Bifunctor (Bifunctor (bimap))
 import Data.Bitraversable (Bitraversable (bitraverse))
 import Data.ByteString (ByteString)
@@ -114,8 +113,7 @@ import Data.Functor.Identity (Identity)
 import Data.Map (Map)
 import qualified Data.Map as Map
 import qualified Data.Map.Merge.Lazy as Map
-import Data.Maybe (catMaybes, isJust)
-import Data.Monoid (First (First, getFirst))
+import Data.Maybe (isJust)
 import Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
 import Data.Set (Set)
@@ -523,21 +521,25 @@ saveTermComponent h terms = do
             dependencies :: Set S.Reference =
               let (tmRefs, tpRefs, tmLinks, tpLinks) = TermUtil.dependencies tm
                   tpRefs' = Foldable.toList $ C.Type.dependencies tp
-                  getTermSRef :: S.Term.TermRef -> Maybe S.Reference
-                  getTermSRef (C.ReferenceBuiltin t) = Just (C.ReferenceBuiltin (tIds Vector.! fromIntegral t))
-                  getTermSRef (C.Reference.Derived (Just h) i) = Just (C.Reference.Derived (oIds Vector.! fromIntegral h) i)
-                  getTermSRef _selfCycleRef@(C.Reference.Derived Nothing _) = Nothing
+                  getTermSRef :: S.Term.TermRef -> S.Reference
+                  getTermSRef = \case
+                    C.ReferenceBuiltin t -> C.ReferenceBuiltin (tIds Vector.! fromIntegral t)
+                    C.Reference.Derived mh i ->
+                      C.Reference.Derived (maybe oId (\h -> oIds Vector.! fromIntegral h) mh) i
                   getTypeSRef :: S.Term.TypeRef -> S.Reference
-                  getTypeSRef (C.ReferenceBuiltin t) = C.ReferenceBuiltin (tIds Vector.! fromIntegral t)
-                  getTypeSRef (C.Reference.Derived h i) = C.Reference.Derived (oIds Vector.! fromIntegral h) i
+                  getTypeSRef = \case
+                    C.ReferenceBuiltin t -> C.ReferenceBuiltin (tIds Vector.! fromIntegral t)
+                    C.Reference.Derived h i -> C.Reference.Derived (oIds Vector.! fromIntegral h) i
                   getSTypeLink = getTypeSRef
-                  getSTermLink :: S.Term.TermLink -> Maybe S.Reference
-                  getSTermLink = getFirst . bifoldMap (First . getTermSRef) (First . Just . getTypeSRef)
+                  getSTermLink :: S.Term.TermLink -> S.Reference
+                  getSTermLink = \case
+                    C.Referent.Con ref _conId -> getTypeSRef ref
+                    C.Referent.Ref ref -> getTermSRef ref
                in Set.fromList $
-                    catMaybes
-                      (fmap getTermSRef tmRefs ++ fmap getSTermLink tmLinks)
-                      ++ fmap getTypeSRef (tpRefs ++ tpRefs')
-                      ++ fmap getSTypeLink tpLinks
+                    map getTermSRef tmRefs
+                      ++ map getSTermLink tmLinks
+                      ++ map getTypeSRef (tpRefs ++ tpRefs')
+                      ++ map getSTypeLink tpLinks
          in Set.map (,self) dependencies
   traverse_ (uncurry Q.addToDependentsIndex) dependencies
 
@@ -803,7 +805,7 @@ w2cTerm ids tm = do
 
 -- ** Saving & loading type decls
 
-saveDeclComponent :: EDB m => H.Hash -> [(C.Decl Symbol)] -> m Db.ObjectId
+saveDeclComponent :: EDB m => H.Hash -> [C.Decl Symbol] -> m Db.ObjectId
 saveDeclComponent h decls = do
   when debug . traceM $ "Operations.saveDeclComponent " ++ show h
   sDeclElements <- traverse (c2sDecl Q.saveText primaryHashToExistingObjectId) decls