Rewrite dxr-build with optparse so I don't have to keep looking at that tangle.
Simplify json-test makefile a tad.