wrc: Explicitly define structure creation functions instead of playing with macros.