Merge "Minor cleanup of deepHashCode / deepEquals."