Separate combinators, add zeroOrMoreList/oneOrMoreList