I'm pretty sure the original answer always had the partial transfiguration / nanotubes / garotte element. Consider the bit at the very start of chapter 1 (fraction of a line, robes falling, blood); the fact that in H&H's transfiguration experiments they use nanowires, verify that they're very strong, and verify that their length can be changed by transfiguration; arguably the bit in chapter 7 where Harry thinks what a good idea it would be just to decapitate all the Death Eaters; Dumbledore's insistence that partial transfiguration, being a power the Dark Lord knows not, may be vital to his victory.