Split Segment from SegmentUse to better match the schema
Misc fixes; start test for parser