Fixed issue with parsing 'composite' tokens. This was causing problems where items were parsing as <optional_fraction> when they should have accepted by <num>