Revert gratuitous style changes and attempt to maintain consistent style.

Requested by:	bde
- Update for atomic_swap() and atomic_testandclear().
- Try to maintain consistent style.