Hoist a convertValue call to the two paths where it is needed.