Improve existing convert functions (remove unnecessary shuffles/widenings)

Change-Id: I3e1e7c1414ab05410be55ed821087bd1f5484dfb
1 file changed