More cleanups for #490 - remove more index grouping code.