Can we get rid of the above conditional simply by adding `data.getId() == p.getId() ||` at the start of this one?