Some cleanup of JSON.hs