Removed some unnecessary conversions.