Tweaks before rewriting.