Simplify collectors according to HLint suggestions using a more
applicative style