Switch the remaining code to use the new ToHex function