Sync with version in current GHC patch

Note to self: flipping the arguments to the combinator in insertWith
required changes to fromList and a test (look for new uses of const).

--HG--
extra : amend_source : bf6e396483975cfad327e58ed37762776c0f678e