Further refinements of content assist related stuff