Two more Equals/HashCode/StringBuilder replacements