Fixing tuple swap and single element ctors