@kha I renamed the homogeneous `map` to `hmap`, and added the heterogeneous one as `map`. As soon as we add user-defined rewriting rules, we will be able to replace `map` with `hmap` whenever the types are the same.