[pl] more disambiguation and two new simple rules