Fix other ATOMIC_BLOCK using same c++ work-around.