Cleanup implicit conversions where possible