Changes to JSONParser for conversion to Swift lang