8060474: Resolve more parsing ambiguity
Reviewed-by: mullan, ahgross
7 files changed