Removing redundant code, no need to convert a value to a JSON node that's already been converted
Merge branch 'json-support'