Fixed bug introduced in previous commit with creating parse trees

My previous commit fixed the issue with constituent ID's being
repeated for a parse tree, but the parse "trees" that were being
created weren't actually trees.

The Thrift version of s2chelper() should now work as well as the
protobuf version of the function worked.