change 5_types back to explicit equalities (except 9.5)