Move our json-reformat and es-mode changes out to patches we'll keep in user-lisp.