5 files changed, 5 insertions, 7 deletions
diff --git a/module/vcomponent/ical/output.scm b/module/vcomponent/ical/output.scm
index ff5465c6..ec2458ba 100644
--- a/module/vcomponent/ical/output.scm
+++ b/module/vcomponent/ical/output.scm
@@ -14,7 +14,6 @@
   :use-module (vcomponent recurrence)
   :use-module (vcomponent geo)
   :use-module (vcomponent ical types)
-  :use-module (output common)
   :autoload (vcomponent instance) (global-event-object)
   :use-module ((datetime instance) :select (zoneinfo))
   )
diff --git a/module/vcomponent/vdir/parse.scm b/module/vcomponent/vdir/parse.scm
index ae4ea692..c4b1b694 100644
--- a/module/vcomponent/vdir/parse.scm
+++ b/module/vcomponent/vdir/parse.scm
@@ -4,7 +4,7 @@
 ;; (vcomponent parse ical) handles reading data from icalendar files.
 ;;; Code:
 
-(define-module (vcomponent parse)
+(define-module (vcomponent vdir parse)
   :use-module (srfi srfi-1)
 
   :use-module ((ice-9 hash-table) :select (alist->hash-table))
@@ -24,7 +24,7 @@
 ;; All VTIMEZONE's seem to be in "local" time in relation to
 ;; themselves. Therefore, a simple comparison should work,
 ;; and then the TZOFFSETTO properties can be subtd.
-(define (parse-vdir path)
+(define-public (parse-vdir path)
   (let ((/ (lambda args (string-join args file-name-separator-string 'infix))))
     (let ((color
            (catch 'system-error
diff --git a/module/vcomponent/vdir/save-delete.scm b/module/vcomponent/vdir/save-delete.scm
index 0bc9cb4a..2cbe96bf 100644
--- a/module/vcomponent/vdir/save-delete.scm
+++ b/module/vcomponent/vdir/save-delete.scm
@@ -11,6 +11,7 @@
 
 (define-module (vcomponent vdir save-delete)
   :use-module (util)
+  :use-module ((util exceptions) :select (assert)) 
   :use-module (vcomponent ical output)
   :use-module (vcomponent)
   :use-module ((util io) :select (with-atomic-output-to-file))
@@ -20,7 +21,7 @@
 (define-public (save-event event)
   (define calendar (parent event))
 
-  (assert 'vdir (prop calendar '-X-HNH-SOURCETYPE))
+  (assert (eq? 'vdir (prop calendar '-X-HNH-SOURCETYPE)))
 
   (let* ((uid (or (prop event 'UID) (uuidgen))))
     (set! (prop event 'UID) uid
@@ -35,5 +36,5 @@
 
 (define-public (remove-event event)
   (define calendar (parent event))
-  (assert 'vdir (prop calendar '-X-HNH-SOURCETYPE))
+  (assert (eq? 'vdir (prop calendar '-X-HNH-SOURCETYPE)))
   (delete-file (prop event '-X-HNH-FILENAME)))
diff --git a/module/vcomponent/xcal/output.scm b/module/vcomponent/xcal/output.scm
index 4aa68b00..ec162ec0 100644
--- a/module/vcomponent/xcal/output.scm
+++ b/module/vcomponent/xcal/output.scm
@@ -5,7 +5,6 @@
   :use-module (vcomponent geo)
   :use-module (vcomponent xcal types)
   :use-module (ice-9 match)
-  :use-module (output common)
   :use-module (datetime)
   :use-module (srfi srfi-1)
   )
diff --git a/module/vcomponent/xcal/types.scm b/module/vcomponent/xcal/types.scm
index e56ace55..30916a35 100644
--- a/module/vcomponent/xcal/types.scm
+++ b/module/vcomponent/xcal/types.scm
@@ -2,7 +2,6 @@
   :use-module (util)
   :use-module (vcomponent ical types)
   :use-module (datetime)
-  :use-module (output common)
   )
 
 (define (write-boolean _ v)