improved checking of known structs