More map-bounds fixes

Followup to #6334.