@@ -87,11 +87,11 @@
 (define html-subsection (default-tag-function 'h3))
 (define html-newthought (default-tag-function 'span #:class "newthought"))
 (define html-smallcaps (default-tag-function 'span #:class "smallcaps"))
 (define html-center (default-tag-function 'div #:style "text-align: center"))
 
-(define-tag-function (html-root attrs elements)
+(define (html-root . elements)
   (define first-pass
     (decode-elements elements
                      #:txexpr-elements-proc decode-hardwrapped-paragraphs
                      #:exclude-tags '(script style figure table pre)))
   (define second-pass
@@ -100,17 +100,17 @@
                      #:inline-txexpr-proc decode-link-urls
                      #:string-proc (compose1 smart-quotes smart-dashes)
                      #:exclude-tags '(script style pre code)))
   `(body ,@second-pass ,(html-footnote-block)))
 
-(define-tag-function (html-blockcode attrs elems)
+(define (html-blockcode attrs elems)
   (define file (or (assoc 'filename attrs) ""))
   (define codeblock `(pre [[class "code"]] (code ,@elems)))
   (cond [(string>? file "") `(@ (div [[class "listing-filename"]] 128196 " " ,file) ,codeblock)]
         [else codeblock]))
 
-(define-tag-function (html-verse attrs elems)
+(define (html-verse attrs elems)
   (let* ([title  (or (assoc 'title attrs) "")]
          [italic? (assoc 'italic attrs)]
          [pre-attrs (cond [italic? '([class "verse"] [style "font-style: italic"])]
                           [else '([class "verse"])])]
          [pre-title (cond [(string>? title "") '(p [[class "verse-heading"]] ,title)]
@@ -189,7 +189,7 @@
                                                                     (format "~a" (+ 1 fnref-num)))]] "↩"))])
                 `(li [[id ,(fndef-id fn-name)]] ,@definition-text ,@backrefs))))
   (cond [(null? note-items) ""]
         [else `(section ((class "footnotes")) (hr) (ol ,@note-items))]))
 
-(define-tag-function (html-note attrs elems)
+(define (html-note attrs elems)
   (txexpr 'note attrs (decode-paragraphs elems #:force? #t)))