HW-ATOMIC macro cleanup
First, unoptimized version of hybrid HW/SW transactions