Update grammar and tests for GenericTypeArguments.