Hygiene: Remove duplication in one-off indexes

Change-Id: I7ba12d879035b965d8894ae988b7b6dc6fafd050