More cleanup for webcomponents switch

Formerly known as #719, ... now a real PR against master.