Further clean up.

Instead of removing temporary data structure, clone Segment.