Update for core refactor. No API changes.