Simplified struct grammar.
Cleanup.