fix more instances of old a_xchg (use new a_swap name)