[pl] fix false alarms, simplify rules