Fix the compiler fixes
Fix the compiler fixes

This is what happens when you fix a compiler warning about a shadowing
variable and you don't run the test suite to check the results.

ebassi/json-glib,Distrotech/json-glib,GNOME/json-glib,GNOME/json-glib,ebassi/json-glib,Distrotech/json-glib,frida/json-glib,robtaylor/json-glib-gvariant,brauliobo/json-glib,robtaylor/json-glib-gvariant,oerdnj/json-glib,frida/json-glib,oerdnj/json-glib,ebassi/json-glib,brauliobo/json-glib,brauliobo/json-glib,Distrotech/json-glib,oerdnj/json-glib,oerdnj/json-glib