[pl] more disambiguation to get rid of false alarms