Some grammar modification