Use a different scheme to chose 16/32 variants. This scheme is more

consistent with how BuildMI works. No new tests needed. All should work
the same as before.

llvm-svn: 175342