bring back lenient wrapping unless classes is explicitly set
rename variable for clarity
Merge branch 'lenient-wrapping' into jsonobject