Adapt to recent changes in main repository.