Improved consistency in Map's internal methods, another RuntimeException