Replace maps with list comprehension.

* Also change short var name.