1.0.5.50: some compare-and-swap changes