given this, not using `entrySet()` looks to me like a step backward