Re-added equality test (equals() was failing with null argument).