More changes. May get rid of Composite structures since they are built
into the parsers.