Reordered structures and variable definitions.