[pl] more disambiguation never hurts, fix false alarms using antipatterns