Replace "annotation" with "index"; move alias clean up.