Fix population level throttling, close #1610
Beware of mapValues, that's a view