Remove some unnecessary list() calls around map() results