Fixing up trace.thy