Cut out the second call to .map so it happens in a single pass.
Merge pull request #1 from functionreturnfunction/master

Cut out the second call to .map so it happens in a single pass.