Make options consistent with UPS XML.