#1513299: cleanup some map() uses where a comprehension works better.
6 files changed