Remove the last of the uneeded closures from JSON functions