Added OptionalChoice and better syntax for CharRanges

Also fixed a failing json test.