Fresh name rewriters

Ouch.