Changes after the sugar-html-core split.