Another code reorganization.