Fix FormTypes and TypeGuesser