Address code review for moving grammar check of typeParameter