Split again in anticipation of autocomplete experiment.