Make use of new the tryif tactical in [test] and [not]

It's a cleaner way to write [test] and [not].

Also make [atomic] a bit more complete.