Be more intelligent about adding/dropping indices.