rolling back replacing arrays and objects with JTokens

Lost some utility when I returned JTokens with the result set. Will
replace the arrays and objects with the JToken just prior to
serialization.