Rearrange code in HIR conversion of ?: operator

There are no functional changes.  Code is just moved arround.  This
prepares for the next set of changes that do change the functionality.
1 file changed