Readded struct checking and tested with test2.sol.

Some problems with merging deleted it. I've proudly restored.
｡◕‿◕｡