Simplified struct definitions by eliminiating redundant typedefs