Less undefined behavior way of doing byte swap (#1862)

Less undefined behavior way of doing byte swap (#1862) #1051