Start fixing inferencer for type system changes