Revert 'atscppapi: Locking fix in xform and utility macro' This closes #61