Renamed and, or to choice, sequence.
Added factories for id, combine, collect and rewrite.