Cleanup combining code, flatten modules

src/Dodge/Item/Grammar.hs

@@ -73,7 +73,7 @@ ammoComposedItem' itm = fromMaybe (error "in ammoComposedItem, wrong item") $ do
             ,noa (AmmoTargetingSF atype) AmmoTargetingLink
             ,noa (AmmoPayloadSF atype) AmmoPayloadLink
             ,noa (AmmoEffectSF atype) AmmoEffectLink
-            ,noa (RemoteScreenSF) RemoteScreenLink
+            ,noa RemoteScreenSF RemoteScreenLink
             ] 
             []
         )
@@ -125,7 +125,7 @@ invLDT'' =
         . fmap (singleLDT . basePartiallyComposedItem')
 
 invLDT' :: IM.IntMap Item -> [LabelDoubleTree ComposeLinkType ComposedItem]
-invLDT' = map (first _iatType . second (\(x,y,_) -> (x,y))) . invLDT''
+invLDT' = map (bimap _iatType (\(x,y,_) -> (x,y))) . invLDT''
 
 -- this assumes the creature inventory is well formed, specifically the
 -- location ids