Update struct / class macros

[fare]

With #1033 the internals of structs and classes have evolved to unify the two. The macros that handle structures in the compiler should be updated in accordance.