[684600] Treat all value types equally