Revert "[WIP] Simplify setting up types for Collection & Hash"

This reverts commit 69f37ae6584930fb43e530e2830bafc483fe3fa4.