Efficiency tweaks.