Rewrite some thin places