--- a/links-page.lisp
+++ b/links-page.lisp
@@ -1,30 +1,46 @@
+(in-package :sbcl-page)
+
 (define-page :links "Links" "links" links-page :index-order :bottom)
 
-(defmacro format-links (&rest pairs)
-  `(list :|ul|
-    ,@(mapcar #'(lambda (pair)
-                  `(list :|li|
-                    (list (list :|a| :|href| ,(first pair))
-                     ,(second pair))
-                    " - " ,(third pair)))
-              pairs)))
+(defun format-links (pairs)
+  (<ul>
+   (mapcar
+    (lambda (pair)
+      (<li>
+       (<a href=,(first pair)>
+           (second pair))
+       " - " (third pair)))
+    pairs)))
 
 (defun links-page ()
-  `((:|p| "Links to SBCL pages:"
-     ,(format-links
-       ("http://sourceforge.net/projects/sbcl" "SBCL's SourceForge
-page" "file downloads, mailing lists, and other resources")
-       ("/manual/" "The SBCL Manual" "a fine manual")
-       ("/sbcl-internals/" "The SBCL Internals Manual" "describes SBCL's implementation details")
-       ("http://sbcl-internals.cliki.net/" "The SBCL Internals CLiki" "a wiki describing SBCL's implementation")
-       ("http://planet.sbcl.org/" "Planet SBCL" "a meta-blog of blogs of SBCL developers, SBCL CVS activity, and SBCL test results")
-       ("http://sbcl.unmutual.info/" "SBCL Daily Tests" "SBCL daily builds and tests, used by the SBCL developers for regression testing")
-       ("http://sbcl.boinkor.net/bench/" "SBCL Benchmarks" "automatic benchmarks of SBCL builds, used by the SBCL developers for catching performance regressions")))
-    (:|p| "Links to other interesting / relevant pages:"
-     ,(format-links
-       ("http://www.cliki.net/" "CLiki" "a SBCL-powered Wiki for free
-Common Lisp software")
-       ("http://planet.lisp.org" "Planet Lisp" "a meta-blog of blogs from Common Lisp users and implementors")
-       ("http://www.lispworks.com/reference/HyperSpec/" "The
-HyperSpec" "an online hyperlinked version of the ANSI Common Lisp
-specification")))))
+  (list
+   (<p> "Links to SBCL pages:"
+        (format-links
+         `(("http://sourceforge.net/projects/sbcl"
+            "SBCL's SourceForge page"
+            "file downloads, mailing lists, and other resources")
+           ("/manual/" "The SBCL Manual" "a fine manual")
+           ("/sbcl-internals/"
+            "The SBCL Internals Manual"
+            "describes SBCL's implementation details")
+           ("http://sbcl-internals.cliki.net/"
+            "The SBCL Internals CLiki"
+            "a wiki describing SBCL's implementation")
+           ("http://planet.sbcl.org/"
+            "Planet SBCL"
+            "a meta-blog of blogs of SBCL developers, SBCL CVS activity, and SBCL test results")
+           ("http://sbcl.boinkor.net/bench/"
+            "SBCL Benchmarks"
+            "automatic benchmarks of SBCL builds, used by the SBCL developers for catching performance regressions"))))
+   (<p>
+    "Links to other interesting / relevant pages:"
+    (format-links
+     `(("http://www.cliki.net/"
+        "CLiki"
+        "a SBCL-powered Wiki for free Common Lisp software")
+       ("http://planet.lisp.org"
+        "Planet Lisp"
+        "a meta-blog of blogs from Common Lisp users and implementors")
+       ("http://www.lispworks.com/reference/HyperSpec/"
+        "The HyperSpec"
+        "an online hyperlinked version of the ANSI Common Lisp specification"))))))