Reapplies 1585ed637d101ed16adb6b9ebdfa465299bfdb13 which was reverted in
f3adbe249b0dfad91318916142a33619232a968f.
I removed use of `usingnamespace` in this commit.
@semarie audited this struct definition.
b1bde35651Andrew Kelley committed on 7/31/2023, 6:51:08 PMparent235b9fc