Some more struct cleanup.