Midstream changes to deal with spontaneous solving and flatten skolem equivalence...