Minor tweaks on the completion list.