TreeWitnessRewriter slimmed down