Improve on Task cloning

Make it more consistent, somehow.