All sorries now in Example2.thy and Trace.thy