Fix completion issues caused by recent improvements.