Make XPS happy and remove some GPU address munging.