Defend against shoddy type inf, close #35