Changed use of depreciated Data.FiniteMap to Data.Map with Happy --glr mode