If eachWithIndex is called on a Map with a three-arg closure, a MissingMethodException is thrown. It would be better if the closure was passed the key, value, and index, similar to the change in behavior of Map.each when called with a one or two-arg closure. I've attached a patch that makes this change and adds tests for eachWithIndex on a Map.