Improvements to the semantic completion.