Renamings in combiner and flatmap to for comprehension formatting.