Looks good.  Confirmed non std atomics still builds and runs by commenting out
#defines.

Good to merge.