Update Version to not use string anymore

Apply non-related changes from #3973.