MFC r267252, r267253:

  - Remove an unnecessary variable reassignment
  - Fix TSO support on VMware Fusion