Final piece to the config driven autocomplete config

Oops... I left this out of my previous pull request!

Sorry!