1.0.5.6: compare-and-swap / instance-set-conditional refactoring