diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_location.out b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_location.out
index e8a3d204c..35f0d8fea 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_location.out
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_location.out
@@ -6,19 +6,19 @@
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.HaxlMaybe.catchNotFoundToNothing" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 22, "start": 698 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "length": 1, "start": 281 }
               }
             }
           }
         }
       },
       "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 22, "start": 698 } },
-        "name": "Lib.HaxlMaybe.catchNotFoundToNothing"
+        "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+        "location": { "span": { "length": 1, "start": 281 } },
+        "name": "A.a"
       }
     }
   },
@@ -28,591 +28,19 @@
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.HaxlMaybe.chain" },
+              "name": { "key": "B.b" },
               "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 5, "start": 339 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "length": 1, "start": 284 }
               }
             }
           }
         }
       },
       "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 5, "start": 339 } },
-        "name": "Lib.HaxlMaybe.chain"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.HaxlMaybe.chainMay" },
-              "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 8, "start": 234 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 8, "start": 234 } },
-        "name": "Lib.HaxlMaybe.chainMay"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.HaxlMaybe.firstJust" },
-              "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 9, "start": 519 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 9, "start": 519 } },
-        "name": "Lib.HaxlMaybe.firstJust"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.HaxlMaybe.fromThrowable" },
-              "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 13, "start": 992 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 13, "start": 992 } },
-        "name": "Lib.HaxlMaybe.fromThrowable"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.HaxlMaybe.mapMaybeM" },
-              "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 9, "start": 1264 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 9, "start": 1264 } },
-        "name": "Lib.HaxlMaybe.mapMaybeM"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.HaxlMaybe.traverseMay" },
-              "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 11, "start": 431 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 11, "start": 431 } },
-        "name": "Lib.HaxlMaybe.traverseMay"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.HaxlMaybe.withDefaultMaybe" },
-              "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "length": 16, "start": 1094 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/HaxlMaybe.hs" },
-        "location": { "span": { "length": 16, "start": 1094 } },
-        "name": "Lib.HaxlMaybe.withDefaultMaybe"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 13, "start": 283 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 13, "start": 283 } },
-        "name": "Lib.Input.InputKey.InputKey"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 34, "start": 262 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 34, "start": 262 } },
-        "name": "Lib.Input.InputKey.InputKey"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetch" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 5, "start": 353 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 5, "start": 353 } },
-        "name": "Lib.Input.InputKey.fetch"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchDefault" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 12, "start": 1518 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 12, "start": 1518 } },
-        "name": "Lib.Input.InputKey.fetchDefault"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEnt" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 8, "start": 1153 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 8, "start": 1153 } },
-        "name": "Lib.Input.InputKey.fetchEnt"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEntMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 11, "start": 1265 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 11, "start": 1265 } },
-        "name": "Lib.Input.InputKey.fetchEntMay"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchId" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 7, "start": 557 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 7, "start": 557 } },
-        "name": "Lib.Input.InputKey.fetchId"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchIdMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 10, "start": 800 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 10, "start": 800 } },
-        "name": "Lib.Input.InputKey.fetchIdMay"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 8, "start": 433 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 8, "start": 433 } },
-        "name": "Lib.Input.InputKey.fetchMay"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchThrift" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 11, "start": 1721 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 11, "start": 1721 } },
-        "name": "Lib.Input.InputKey.fetchThrift"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchable" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 9, "start": 1592 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 9, "start": 1592 } },
-        "name": "Lib.Input.InputKey.fetchable"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.withInput" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "length": 9, "start": 1982 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "length": 9, "start": 1982 } },
-        "name": "Lib.Input.InputKey.withInput"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.Internal.unknownEnumErrorMsg" },
-              "source": {
-                "file": { "key": "Lib/Thrift/Internal.hs" },
-                "span": { "length": 19, "start": 164 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift/Internal.hs" },
-        "location": { "span": { "length": 19, "start": 164 } },
-        "name": "Lib.Thrift.Internal.unknownEnumErrorMsg"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.ThriftException" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "length": 20, "start": 611 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift.hs" },
-        "location": { "span": { "length": 20, "start": 611 } },
-        "name": "Lib.Thrift.ThriftException"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.ThriftException" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "length": 68, "start": 585 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift.hs" },
-        "location": { "span": { "length": 68, "start": 585 } },
-        "name": "Lib.Thrift.ThriftException"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.deserializeCompact" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "length": 18, "start": 1143 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift.hs" },
-        "location": { "span": { "length": 18, "start": 1143 } },
-        "name": "Lib.Thrift.deserializeCompact"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.deserializeEntSchemaThriftStruct" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "length": 32, "start": 1355 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift.hs" },
-        "location": { "span": { "length": 32, "start": 1355 } },
-        "name": "Lib.Thrift.deserializeEntSchemaThriftStruct"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.deserializeJSON" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "length": 15, "start": 936 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift.hs" },
-        "location": { "span": { "length": 15, "start": 936 } },
-        "name": "Lib.Thrift.deserializeJSON"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.serializeJSON" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "length": 13, "start": 834 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift.hs" },
-        "location": { "span": { "length": 13, "start": 834 } },
-        "name": "Lib.Thrift.serializeJSON"
-      }
-    }
-  },
-  {
-    "key": {
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.unknownEnumError" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "length": 16, "start": 1831 }
-              }
-            }
-          }
-        }
-      },
-      "location": {
-        "file": { "key": "Lib/Thrift.hs" },
-        "location": { "span": { "length": 16, "start": 1831 } },
-        "name": "Lib.Thrift.unknownEnumError"
+        "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+        "location": { "span": { "length": 1, "start": 284 } },
+        "name": "B.b"
       }
     }
   }
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.out b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.out
index 39ee40d01..fc1fde1fe 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.out
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.out
@@ -6,17 +6,17 @@
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchDefault" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1518, "length": 12 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
               }
             }
           }
         }
       },
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "span": { "start": 1494, "length": 12 }
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+      "span": { "start": 228, "length": 1 }
     }
   },
   {
@@ -25,17 +25,112 @@
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchDefault" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1518, "length": 12 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
               }
             }
           }
         }
       },
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "span": { "start": 1518, "length": 12 }
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+      "span": { "start": 269, "length": 1 }
+    }
+  },
+  {
+    "key": {
+      "target": {
+        "hs": {
+          "definition": {
+            "key": {
+              "name": { "key": "A.a" },
+              "source": {
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
+              }
+            }
+          }
+        }
+      },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+      "span": { "start": 281, "length": 1 }
+    }
+  },
+  {
+    "key": {
+      "target": {
+        "hs": {
+          "definition": {
+            "key": {
+              "name": { "key": "A.a" },
+              "source": {
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
+              }
+            }
+          }
+        }
+      },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+      "span": { "start": 306, "length": 1 }
+    }
+  },
+  {
+    "key": {
+      "target": {
+        "hs": {
+          "definition": {
+            "key": {
+              "name": { "key": "B.b" },
+              "source": {
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
+              }
+            }
+          }
+        }
+      },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+      "span": { "start": 228, "length": 1 }
+    }
+  },
+  {
+    "key": {
+      "target": {
+        "hs": {
+          "definition": {
+            "key": {
+              "name": { "key": "B.b" },
+              "source": {
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
+              }
+            }
+          }
+        }
+      },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+      "span": { "start": 273, "length": 1 }
+    }
+  },
+  {
+    "key": {
+      "target": {
+        "hs": {
+          "definition": {
+            "key": {
+              "name": { "key": "B.b" },
+              "source": {
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
+              }
+            }
+          }
+        }
+      },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+      "span": { "start": 284, "length": 1 }
     }
   }
 ]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.perf b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.perf
index bb610594c..71641425c 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.perf
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.perf
@@ -1,6 +1 @@
-{
-  "@generated": null,
-  "hs.Definition.2": 1,
-  "hs.DefinitionName.1": 1,
-  "hs.TargetUses.2": 1
-}
\ No newline at end of file
+{ "@generated": null, "hs.TargetUses.2": 3 }
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.query b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.query
index f1d1b6e03..ea202b7fe 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.query
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/entity_uses.query
@@ -1,4 +1,3 @@
-query: |
-  codemarkup.EntityUses {target = {hs = { definition = {name = "Lib.Input.InputKey.fetchDefault"}}}}
+query: codemarkup.EntityUses _
 perf: true
 transform: [gensort, []]
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.out b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.out
index ae4b48af5..f7858451d 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.out
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.out
@@ -2,20 +2,20 @@
   "@generated",
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
       "location": {
-        "name": "Lib.Input.InputKey.InputKey",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 262, "length": 34 } }
+        "name": "A.a",
+        "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+        "location": { "span": { "start": 281, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
               }
             }
           }
@@ -25,250 +25,20 @@
   },
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
       "location": {
-        "name": "Lib.Input.InputKey.InputKey",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 283, "length": 13 } }
+        "name": "B.b",
+        "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+        "location": { "span": { "start": 284, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "B.b" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetch",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 353, "length": 5 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetch" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 353, "length": 5 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchDefault",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 1518, "length": 12 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchDefault" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1518, "length": 12 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchEnt",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 1153, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEnt" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1153, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchEntMay",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 1265, "length": 11 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEntMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1265, "length": 11 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchId",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 557, "length": 7 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchId" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 557, "length": 7 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchIdMay",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 800, "length": 10 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchIdMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 800, "length": 10 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchMay",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 433, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 433, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchThrift",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 1721, "length": 11 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchThrift" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1721, "length": 11 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.fetchable",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 1592, "length": 9 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchable" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1592, "length": 9 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "location": {
-        "name": "Lib.Input.InputKey.withInput",
-        "file": { "key": "Lib/Input/InputKey.hs" },
-        "location": { "span": { "start": 1982, "length": 9 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.withInput" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1982, "length": 9 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
               }
             }
           }
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.perf b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.perf
index 7ef4fdb99..0d3f36d4d 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.perf
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.perf
@@ -1 +1 @@
-{ "@generated": null, "hs.FileDefinition.2": 12, "src.File.1": 1 }
\ No newline at end of file
+{ "@generated": null, "hs.FileDefinition.2": 2 }
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.query b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.query
index 5e9e684ed..496409571 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.query
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_locations.query
@@ -1,4 +1,3 @@
-query: |
-  codemarkup.FileEntityLocations { file = "Lib/Input/InputKey.hs"};
+query: codemarkup.FileEntityLocations _
 perf: true
 transform: [gensort, []]
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.out b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.out
index e4f07c85c..0e45769e4 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.out
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.out
@@ -2,23 +2,23 @@
   "@generated",
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
       "xref": {
         "target": {
-          "name": "Lib.HaxlMaybe.catchNotFoundToNothing",
-          "file": { "key": "Lib/HaxlMaybe.hs" },
-          "location": { "span": { "start": 698, "length": 22 } }
+          "name": "A.a",
+          "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+          "location": { "span": { "start": 281, "length": 1 } }
         },
-        "source": { "span": { "start": 457, "length": 22 } }
+        "source": { "span": { "start": 228, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.HaxlMaybe.catchNotFoundToNothing" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/HaxlMaybe.hs" },
-                "span": { "start": 698, "length": 22 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
               }
             }
           }
@@ -28,23 +28,23 @@
   },
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
       "xref": {
         "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
+          "name": "A.a",
+          "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+          "location": { "span": { "start": 281, "length": 1 } }
         },
-        "source": { "span": { "start": 270, "length": 8 } }
+        "source": { "span": { "start": 269, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
               }
             }
           }
@@ -54,23 +54,23 @@
   },
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
       "xref": {
         "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
+          "name": "A.a",
+          "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+          "location": { "span": { "start": 281, "length": 1 } }
         },
-        "source": { "span": { "start": 283, "length": 8 } }
+        "source": { "span": { "start": 281, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
               }
             }
           }
@@ -80,23 +80,23 @@
   },
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
       "xref": {
         "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
+          "name": "A.a",
+          "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+          "location": { "span": { "start": 281, "length": 1 } }
         },
-        "source": { "span": { "start": 344, "length": 8 } }
+        "source": { "span": { "start": 306, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "A.a" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
               }
             }
           }
@@ -106,23 +106,23 @@
   },
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
       "xref": {
         "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
+          "name": "B.b",
+          "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+          "location": { "span": { "start": 284, "length": 1 } }
         },
-        "source": { "span": { "start": 360, "length": 8 } }
+        "source": { "span": { "start": 228, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "B.b" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
               }
             }
           }
@@ -132,23 +132,23 @@
   },
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
       "xref": {
         "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
+          "name": "B.b",
+          "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+          "location": { "span": { "start": 284, "length": 1 } }
         },
-        "source": { "span": { "start": 424, "length": 8 } }
+        "source": { "span": { "start": 273, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "B.b" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
               }
             }
           }
@@ -158,1713 +158,23 @@
   },
   {
     "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
+      "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
       "xref": {
         "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
+          "name": "B.b",
+          "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+          "location": { "span": { "start": 284, "length": 1 } }
         },
-        "source": { "span": { "start": 443, "length": 8 } }
+        "source": { "span": { "start": 284, "length": 1 } }
       },
       "entity": {
         "hs": {
           "definition": {
             "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
+              "name": { "key": "B.b" },
               "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 489, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 518, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 566, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 573, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 762, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 812, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 824, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1115, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1255, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1524, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1532, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1569, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1603, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1781, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 262, "length": 34 } }
-        },
-        "source": { "span": { "start": 1911, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 262, "length": 34 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 270, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 283, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 344, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 360, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 424, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 443, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 489, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 518, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 566, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 573, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 762, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 812, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 824, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1115, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1255, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1524, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1532, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1569, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1603, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1781, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.InputKey",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 283, "length": 13 } }
-        },
-        "source": { "span": { "start": 1911, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.InputKey" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 283, "length": 13 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetch",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 353, "length": 5 } }
-        },
-        "source": { "span": { "start": 321, "length": 5 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetch" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 353, "length": 5 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetch",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 353, "length": 5 } }
-        },
-        "source": { "span": { "start": 353, "length": 5 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetch" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 353, "length": 5 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetch",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 353, "length": 5 } }
-        },
-        "source": { "span": { "start": 482, "length": 5 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetch" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 353, "length": 5 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetch",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 353, "length": 5 } }
-        },
-        "source": { "span": { "start": 566, "length": 5 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetch" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 353, "length": 5 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetch",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 353, "length": 5 } }
-        },
-        "source": { "span": { "start": 1774, "length": 5 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetch" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 353, "length": 5 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchDefault",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1518, "length": 12 } }
-        },
-        "source": { "span": { "start": 1494, "length": 12 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchDefault" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1518, "length": 12 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchDefault",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1518, "length": 12 } }
-        },
-        "source": { "span": { "start": 1518, "length": 12 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchDefault" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1518, "length": 12 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchEnt",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1153, "length": 8 } }
-        },
-        "source": { "span": { "start": 1079, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEnt" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1153, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchEnt",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1153, "length": 8 } }
-        },
-        "source": { "span": { "start": 1153, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEnt" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1153, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchEntMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1265, "length": 11 } }
-        },
-        "source": { "span": { "start": 1216, "length": 11 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEntMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1265, "length": 11 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchEntMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1265, "length": 11 } }
-        },
-        "source": { "span": { "start": 1265, "length": 11 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchEntMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1265, "length": 11 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchId",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 557, "length": 7 } }
-        },
-        "source": { "span": { "start": 489, "length": 7 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchId" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 557, "length": 7 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchId",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 557, "length": 7 } }
-        },
-        "source": { "span": { "start": 557, "length": 7 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchId" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 557, "length": 7 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchId",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 557, "length": 7 } }
-        },
-        "source": { "span": { "start": 1190, "length": 7 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchId" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 557, "length": 7 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchIdMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 800, "length": 10 } }
-        },
-        "source": { "span": { "start": 730, "length": 10 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchIdMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 800, "length": 10 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchIdMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 800, "length": 10 } }
-        },
-        "source": { "span": { "start": 800, "length": 10 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchIdMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 800, "length": 10 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchIdMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 800, "length": 10 } }
-        },
-        "source": { "span": { "start": 1279, "length": 10 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchIdMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 800, "length": 10 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 433, "length": 8 } }
-        },
-        "source": { "span": { "start": 398, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 433, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 433, "length": 8 } }
-        },
-        "source": { "span": { "start": 433, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 433, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 433, "length": 8 } }
-        },
-        "source": { "span": { "start": 814, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 433, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchMay",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 433, "length": 8 } }
-        },
-        "source": { "span": { "start": 2019, "length": 8 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchMay" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 433, "length": 8 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchThrift",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1721, "length": 11 } }
-        },
-        "source": { "span": { "start": 1647, "length": 11 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchThrift" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1721, "length": 11 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchThrift",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1721, "length": 11 } }
-        },
-        "source": { "span": { "start": 1721, "length": 11 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchThrift" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1721, "length": 11 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchable",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1592, "length": 9 } }
-        },
-        "source": { "span": { "start": 1556, "length": 9 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchable" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1592, "length": 9 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.fetchable",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1592, "length": 9 } }
-        },
-        "source": { "span": { "start": 1592, "length": 9 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.fetchable" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1592, "length": 9 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.withInput",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1982, "length": 9 } }
-        },
-        "source": { "span": { "start": 1877, "length": 9 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.withInput" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1982, "length": 9 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Input.InputKey.withInput",
-          "file": { "key": "Lib/Input/InputKey.hs" },
-          "location": { "span": { "start": 1982, "length": 9 } }
-        },
-        "source": { "span": { "start": 1982, "length": 9 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Input.InputKey.withInput" },
-              "source": {
-                "file": { "key": "Lib/Input/InputKey.hs" },
-                "span": { "start": 1982, "length": 9 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Thrift.deserializeJSON",
-          "file": { "key": "Lib/Thrift.hs" },
-          "location": { "span": { "start": 936, "length": 15 } }
-        },
-        "source": { "span": { "start": 204, "length": 15 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.deserializeJSON" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "start": 936, "length": 15 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "key": {
-      "file": { "key": "Lib/Input/InputKey.hs" },
-      "xref": {
-        "target": {
-          "name": "Lib.Thrift.deserializeJSON",
-          "file": { "key": "Lib/Thrift.hs" },
-          "location": { "span": { "start": 936, "length": 15 } }
-        },
-        "source": { "span": { "start": 1739, "length": 15 } }
-      },
-      "entity": {
-        "hs": {
-          "definition": {
-            "key": {
-              "name": { "key": "Lib.Thrift.deserializeJSON" },
-              "source": {
-                "file": { "key": "Lib/Thrift.hs" },
-                "span": { "start": 936, "length": 15 }
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
               }
             }
           }
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.perf b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.perf
index 9cef53672..919614c4c 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.perf
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.perf
@@ -1,7 +1,6 @@
 {
   "@generated": null,
-  "hs.Definition.2": 72,
-  "hs.DefinitionName.1": 125,
-  "hs.FileXRefMap.2": 1,
-  "src.File.1": 1
+  "hs.Definition.2": 7,
+  "hs.DefinitionName.1": 17,
+  "hs.FileXRefMap.2": 2
 }
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.query b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.query
index 2dedcb5e3..984b38c32 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.query
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/file_entity_xrefs.query
@@ -1,4 +1,3 @@
-query: |
-  codemarkup.FileEntityXRefLocations { file = "Lib/Input/InputKey.hs"};
+query: codemarkup.FileEntityXRefLocations _
 perf: true
 transform: [gensort, []]
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.out b/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.out
index 551aa1105..8d018f057 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.out
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.out
@@ -2,13 +2,42 @@
   "@generated",
   {
     "key": {
-      "hs": {
-        "definition": {
-          "key": {
-            "name": { "key": "Lib.Input.InputKey.withInput" },
-            "source": {
-              "file": { "key": "Lib/Input/InputKey.hs" },
-              "span": { "start": 1982, "length": 9 }
+      "location": {
+        "name": "A.a",
+        "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+        "location": { "span": { "start": 281, "length": 1 } }
+      },
+      "entity": {
+        "hs": {
+          "definition": {
+            "key": {
+              "name": { "key": "A.a" },
+              "source": {
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/A.hs" },
+                "span": { "start": 281, "length": 1 }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "location": {
+        "name": "B.b",
+        "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+        "location": { "span": { "start": 284, "length": 1 } }
+      },
+      "entity": {
+        "hs": {
+          "definition": {
+            "key": {
+              "name": { "key": "B.b" },
+              "source": {
+                "file": { "key": "fbcode/glean/lang/haskell/tests/code/B.hs" },
+                "span": { "start": 284, "length": 1 }
+              }
             }
           }
         }
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.perf b/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.perf
index 7ef4fdb99..0d3f36d4d 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.perf
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.perf
@@ -1 +1 @@
-{ "@generated": null, "hs.FileDefinition.2": 12, "src.File.1": 1 }
\ No newline at end of file
+{ "@generated": null, "hs.FileDefinition.2": 2 }
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.query b/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.query
index 9702d6f5a..031f00b2f 100644
--- a/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.query
+++ b/glean/lang/codemarkup/tests/haskell/cases/input_key/resolve_location.query
@@ -1,8 +1,3 @@
-query: |
-  E where
-    codemarkup.ResolveLocation {
-       location = { file = "Lib/Input/InputKey.hs", location = { span = { 1982, 9 } } },
-       entity = E
-    };
+query: codemarkup.ResolveLocation _
 perf: true
 transform: [gensort, []]