Add more specialisations to Class/Struct/Union detection for common cases