Further work toward moving to Web Components.