Reworking structs/unions again.