Also convert json-fix.el to use cl-lib