Try again to use new sortarrays feature in json-stable-stringify.

Expected files in last commit were incorrect.