Use named modules to avoid having to pass redundant parameters

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>

Analysis/Sign.agda

@@ -6,6 +6,9 @@ open import Relation.Nullary using (¬_; Dec; yes; no)
 
 open import Language
 open import Lattice
+import Lattice.Bundles.FiniteValueMap
+
+private module FixedHeightFiniteMap = Lattice.Bundles.FiniteValueMap.FromFiniteHeightLattice
 
 data Sign : Set where
     + : Sign
@@ -36,15 +39,17 @@ module _ (prog : Program) where
     finiteHeightLatticeᵍ = finiteHeightLatticeᵍ-if-inhabited 0ˢ
 
     -- The variable -> sign map is a finite value-map with keys strings. Use a bundle to avoid explicitly specifying operators.
-    open import Lattice.Bundles.FiniteValueMap String SignLattice _≟ˢ_ renaming (finiteHeightLattice to finiteHeightLatticeᵛ-if-B-finite; FiniteHeightType to FiniteHeightTypeᵛ; _≈_ to _≈ᵛ_; ≈-dec to ≈ᵛ-dec-if-≈ᵍ-dec)
-
-
-    VariableSigns = FiniteHeightTypeᵛ finiteHeightLatticeᵍ vars-Unique ≈ᵍ-dec
-    finiteHeightLatticeᵛ = finiteHeightLatticeᵛ-if-B-finite finiteHeightLatticeᵍ vars-Unique ≈ᵍ-dec
-    ≈ᵛ-dec = ≈ᵛ-dec-if-≈ᵍ-dec finiteHeightLatticeᵍ vars-Unique ≈ᵍ-dec
+    open FixedHeightFiniteMap String SignLattice _≟ˢ_ finiteHeightLatticeᵍ vars-Unique ≈ᵍ-dec
+        renaming
+            ( finiteHeightLattice to finiteHeightLatticeᵛ
+            ; FiniteMap to VariableSigns
+            ; _≈_ to _≈ᵛ_
+            ; ≈-dec to ≈ᵛ-dec
+            )
 
     -- Finally, the map we care about is (state -> (variables -> sign)). Bring that in.
-    open import Lattice.Bundles.FiniteValueMap State VariableSigns _≟_ renaming (finiteHeightLattice to finiteHeightLatticeᵐ-if-B-finite; FiniteHeightType to FiniteHeightTypeᵐ)
-
-    StateVariables = FiniteHeightTypeᵐ finiteHeightLatticeᵛ states-Unique ≈ᵛ-dec
-    finiteHeightLatticeᵐ = finiteHeightLatticeᵐ-if-B-finite finiteHeightLatticeᵛ states-Unique ≈ᵛ-dec
+    open FixedHeightFiniteMap State VariableSigns _≟_ finiteHeightLatticeᵛ states-Unique ≈ᵛ-dec
+        renaming
+            ( finiteHeightLattice to finiteHeightLatticeᵐ
+            ; FiniteMap to StateVariables
+            )