Fix bugs, encode freshness in trace formula
Potentially simplify TF (drop some 'true' conjuncts)