[pl] fix some false alarms, clean up disambiguation a bit