Make structure analyzer work better with different kinds of structures.