Hopefully final index tweaks, for now.