diff --git a/extra/logging/analysis/analysis.factor b/extra/logging/analysis/analysis.factor
index 8f7f79d81e..1e1e31c501 100755
--- a/extra/logging/analysis/analysis.factor
+++ b/extra/logging/analysis/analysis.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel sequences namespaces words assocs logging sorting
 prettyprint io io.styles io.files io.encodings.utf8
-strings combinators
+strings combinators accessors arrays
 logging.server logging.parser calendar.format ;
 IN: logging.analysis
 
@@ -12,11 +12,11 @@ SYMBOL: word-histogram
 SYMBOL: message-histogram
 
 : analyze-entry ( entry -- )
-    dup second ERROR eq? [ dup errors get push ] when
-    dup second CRITICAL eq? [ dup errors get push ] when
-    1 over third word-histogram get at+
-    dup third word-names get member? [
-        1 over rest message-histogram get at+
+    dup level>> { ERROR CRITICAL } memq? [ dup errors get push ] when
+    1 over word-name>> word-histogram get at+
+    dup word-name>> word-names get member? [
+        1 over [ level>> ] [ word-name>> ] [ message>> ] tri 3array
+        message-histogram get at+
     ] when
     drop ;
 
@@ -46,10 +46,10 @@ SYMBOL: message-histogram
 : log-entry. ( entry -- )
     "====== " write
     {
-        [ first (timestamp>string) bl ]
-        [ second pprint bl ]
-        [ third write nl ]
-        [ fourth "\n" join print ]
+        [ date>> (timestamp>string) bl ]
+        [ level>> pprint bl ]
+        [ word-name>> write nl ]
+        [ message>> "\n" join print ]
     } cleave ;
 
 : errors. ( errors -- )
@@ -59,7 +59,7 @@ SYMBOL: message-histogram
     "==== INTERESTING MESSAGES:" print nl
     "Total: " write dup values sum . nl
     [
-        dup second write ": " write third "\n" join write
+        dup level>> write ": " write message>> "\n" join write
     ] histogram.
     nl
     "==== WORDS:" print nl