CLN: Modernize usage of map