Code completion related minor tweaks.