Switch from .map to .for

.map will change its behavior to not flatten, while .for will stay
as it is now. See http://pmthium.com/2014/10/apw2014/ for reference