Tiny optimization is possible using Map.entrySet() instead of Map.keySet()

Comment From: sbrannen

This has been merged into 5.3.x and main.

Thanks