Fixup x86 after x86-64 varshift change.