Add option type handling to promote_types_arithmetic