Switch to new HTML method.

(As discussed on Saturday.)