Implementation tweaks.