Slight code cleaning ensuring more static invariants in Rewrite.