Other than the fact this doesn't compile (=P), changing it to this actually breaks several tests (even with a null check too) - I assume it's an issue with overridden == vs equals, although I've  not looked into it further.