Fixup BZHI selection to remove an unneeded zero extension.