Tweaks during full-scale canonicalization run.