diff --git a/src/awk/approx.awk b/src/awk/approx.awk
index 2708044..93a507b 100644
--- a/src/awk/approx.awk
+++ b/src/awk/approx.awk
@@ -5,7 +5,6 @@
 
 # Functions
 
-# parse
 # Time-zone aware parsing of the date/date-time entry at the current record.
 #
 # @local variables: dt
@@ -24,7 +23,6 @@ function parse(    dt) {
     dt gensub(/^([0-9]{8})T([0-9]{2})([0-9]{2})([0-9]{2})(Z)?$/, "\\1 \\2:\\3:\\4\\5", "g", $NF)
 }
 
-# parse_duration
 # Map iCalendar duration specification into the format to be used in date (1).
 #
 # @local variables: dt, dta, i, n, a, seps
@@ -45,7 +43,6 @@ function parse_duration(duration,    dt, dta, i, n, a, seps) {
   return dt
 }
 
-# fn
 # Get relative file path.
 #
 # @local variables: n, a
@@ -56,7 +53,6 @@ function fn(path,    n, a) {
   return a[n-1] "/" a[n]
 }
 
-# title
 # Generate title string that will be displayed to user. Here, the start date
 # gets a monthly resolution.
 #
diff --git a/src/awk/dayview.awk b/src/awk/dayview.awk
index 718aaa6..6300314 100644
--- a/src/awk/dayview.awk
+++ b/src/awk/dayview.awk
@@ -10,7 +10,6 @@
 
 # Functions
 
-# allday
 # Return line for all-day event.
 #
 # @input collection: Collection symbol
@@ -20,7 +19,6 @@ function allday(collection, desc) {
   return collection " " ITALIC FAINT "    (allday)    " OFF desc
 }
 
-# endstoday
 # Return line for multi-day event, or event that starts at midnight, which ends today.
 #
 # @input stop: Time at which the event ends
@@ -31,7 +29,6 @@ function endstoday(stop, collection, desc) {
   return collection " " CYAN "      -- " stop OFF ": " desc
 }
 
-# slice
 # Return line for event that starts sometime today.
 #
 # @input start: Time at which the event starts
@@ -46,7 +43,6 @@ function slice(start, stop, collection, desc) {
     return collection " " CYAN start OFF " -- " CYAN stop OFF ": " desc
 }
 
-# hrline
 # Print line for a single hour entry.
 #
 # @input hour: Hour of the entry
@@ -55,7 +51,6 @@ function hrline(hour) {
   print today, hour, "", "", "", "   " FAINT hour ":00           ----------------------" OFF
 }
 
-# hrlines
 # Print lines for hour entries before an event that starts at `start` and stops
 # at `stop`.
 #
diff --git a/src/awk/new.awk b/src/awk/new.awk
index 545d0bd..94ebe2f 100644
--- a/src/awk/new.awk
+++ b/src/awk/new.awk
@@ -5,20 +5,18 @@
 
 # Functions
 
-# escape
 # Escape string to be used as content in iCalendar files.
 #
 # @input str: String to escape
 # @return: Escaped string
 function escape(str)
 {
-  gsub("\\\\", "\\\\",  str)
-  gsub(";",    "\\\\;", str)
-  gsub(",",    "\\\\,", str)
+  gsub("\\\\", "\\\\", str)
+  gsub(";",    "\\;",  str)
+  gsub(",",    "\\,",  str)
   return str
 }
 
-# print_fold
 # Print property with its content and fold according to the iCalendar
 # specification.
 #
diff --git a/src/awk/parse.awk b/src/awk/parse.awk
index fbb0c16..4008922 100644
--- a/src/awk/parse.awk
+++ b/src/awk/parse.awk
@@ -8,7 +8,6 @@
 
 # Functions
 
-# parse
 # Time-zone aware parsing of the date/date-time entry at the current record.
 #
 # @local variables: dt
@@ -27,7 +26,6 @@ function parse(    dt) {
     dt gensub(/^([0-9]{8})T([0-9]{2})([0-9]{2})([0-9]{2})(Z)?$/, "\\1 \\2:\\3:\\4\\5", "g", $NF)
 }
 
-# parse_duration
 # Map iCalendar duration specification into the format to be used in date (1).
 #
 # @local variables: dt, dta, i, n, a, seps
@@ -48,7 +46,6 @@ function parse_duration(duration,    dt, dta, i, n, a, seps) {
   return dt
 }
 
-# print_data
 # Print string of parsed data.
 #
 # @local variables: cmd, collection, depth, path
diff --git a/src/awk/set.awk b/src/awk/set.awk
index 5c899f6..b954a58 100644
--- a/src/awk/set.awk
+++ b/src/awk/set.awk
@@ -8,16 +8,15 @@
 
 # Functions
 
-# escape
 # Escape string to be used as content.
 #
 # @input str: Content string
 # @return: Escaped string
 function escape(str)
 {
-  gsub("\\\\", "\\\\",   str)
-  gsub(";",    "\\\\;",  str)
-  gsub(",",    "\\\\,",  str)
+  gsub("\\\\", "\\\\", str)
+  gsub(";",    "\\;",  str)
+  gsub(",",    "\\,",  str)
   return str
 }
 
diff --git a/src/awk/update.awk b/src/awk/update.awk
index 1a4170f..b767e07 100644
--- a/src/awk/update.awk
+++ b/src/awk/update.awk
@@ -3,20 +3,18 @@
 
 # Functions
 
-# escape
 # Escape string to be used as content in iCalendar files.
 #
 # @input str: String to escape
 # @return: Escaped string
 function escape(str)
 {
-  gsub("\\\\", "\\\\",  str)
-  gsub(";",    "\\\\;", str)
-  gsub(",",    "\\\\,", str)
+  gsub("\\\\", "\\\\", str)
+  gsub(";",    "\\;",  str)
+  gsub(",",    "\\,",  str)
   return str
 }
 
-# print_fold
 # Print property with its content and fold according to the iCalendar
 # specification.
 #
diff --git a/src/awk/weekview.awk b/src/awk/weekview.awk
index 6e9c1bf..c37880f 100644
--- a/src/awk/weekview.awk
+++ b/src/awk/weekview.awk
@@ -5,7 +5,6 @@
 
 # Functions
 
-# c
 # Compose line that will display a day in the week.
 # 
 # @return: Single-line string