Update to reflect recent changes in Core.