[pl] false alarm fixes via disambiguation and small antipattern changes