More cleanup.  JSON alpha shortly....