BUG-592: Optimize equals() a bit