More rewriting ...