Minor cleanup of Equal.simplify