[pl] more disambiguation to avoid false alarms