Remove explicit type conversions