Fix excessive type conversions