Fix some leftover references from JSON move.