Some more minor reorganization.