Allow creation of children by atomic_add
Some cleanups