We simplify the code a little bit, and make it more consistent since we were already using `where.not` in most places.