[pl] and more disambiguation to avoid false alarms