Reapplies1585ed637dwhich was reverted inf3adbe249b. I removed use of `usingnamespace` in this commit. @semarie audited this struct definition.
Reapplies1585ed637dwhich was reverted inf3adbe249b. I removed use of `usingnamespace` in this commit. @semarie audited this struct definition.