Fix fj_are_structure and FJ_CRE_REINDEX regressions affecting BGII: EE