Simplify equals(..) more.