Simplify things a bit for atomic, gets rid of some bookkeeping, and
makes the code cleaner.

TODO move iterator macro somewhere common.
Signed-off-by: NRob Clark <robdclark@gmail.com>