[pl] more disambiguation, more rules