[pl] more disambiguation and some false alarm fixes