Some minor reorganization.