I realized that some of the trace help strings still say to use a number to refer to a trace when they can now be named, if you could fix those as well :D
Git's merge algorithm did something weird here and accidentally killed the commits on your branch, but I recovered the work - it's been merged in as c7f99a6
I realized that some of the trace help strings still say to use a number to refer to a trace when they can now be named, if you could fix those as well :D