Got most files working except TraceSemantics -- some significant improvements are required.