Merge "Improve existing convert functions (remove unnecessary shuffles/widenings)"