As best as I can tell -1 vs -2 index is not important as they are named args, and using the -2 breaks functionality. But we can chat tomorrow if you don't agree.

Applied the v1 + my fixup per my comments above to next-dts.