Replacement of various integers by findex_t, where appropriate