Removed redundant zeroOrMore, choice, and text