Remove (most of) the FiniteMap wrapper