Minor clean-up: (mapcat f s) instead of (apply concat (map f s))

Same pull request as before but this time based on the vnext branch