Rewrite remaining examples to new element syntax