More structure cleanup.