Makes the comma a special token.
Reserves _ for wildcards.
Updates the specs.