Make it match structs, classes and unions