Small tweaks relating to optimization.