Minor reorganization.