Minor enhancements on the autocompletion