Fixup immutable indexes per review comments.