This is done by changing the type of address field in struct choice to
union inaddr and moving some conversion around.