compare_and_swap reorganization. This should finally make it compile on MacOS X.