Revert r193251 : Use address-taken to disambiguate global variable and indirect memops.