Switch to the new global variables. Should reduce device lookup calls.