@@ -58,14 +58,13 @@
      (with-syntax ([((POLY-TARGET POLY-FUNC) ...) 
                     (for/list ([target (in-list (setup:poly-targets))])
                               (list target (format-id stx "~a-~a" target #'TAG)))]
                    [DEFAULT-FUNC (format-id stx "html-~a" #'TAG)])
        #'(define-tag-function (TAG attributes elems)
-           (define args (cons attributes elems))
            (case (current-poly-target)
-             [(POLY-TARGET) (apply POLY-FUNC args)] ... 
-             [else (apply DEFAULT-FUNC args)])))]))
+             [(POLY-TARGET) (POLY-FUNC attributes elems)] ... 
+             [else (DEFAULT-FUNC attributes elems)])))]))
 
 ;; Like above, but uses `define` instead of `define-tag-function`.
 ;; Use this when you know you will not need keyword arguments.
 ;;
 (define-syntax (poly-branch-tag stx)
@@ -99,11 +98,11 @@
 (poly-branch-tag smallcaps)
 (poly-branch-tag center)
 (poly-branch-tag section)
 (poly-branch-tag subsection)
 (poly-branch-tag code)
-(poly-branch-tag blockcode)
+(poly-branch-kwargs-tag blockcode)
 (poly-branch-kwargs-tag verse)          ; [#:title ""] [#:italic "no"]
 
 (poly-branch-tag link)
 (poly-branch-tag url)
 (poly-branch-tag fn)