[parser] fix some parser issues; and a fix for my last checkin