Trying to get autocomplete right; preliminary changes.