Avoid Itertools::flatten to support rust 1.29

Simplify the earlier fix by using .flat_map(|x| x) in place of .flatten(). This keeps the flow of the code more natural and bides time until Itertools upstream resolves this conflict.