diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml
index 797cbc05a..9604a026f 100644
--- a/roles/httpd/tasks/main.yml
+++ b/roles/httpd/tasks/main.yml
@@ -102,7 +102,7 @@
 
 - name: Create symlinks for enabling our site (debuntu)
   file:
-    path: "/etc/apache2/sites-enabled/{{ item }}"    # Not nec on Raspbian.  Is this really still needed elsewhere?
+    path: "/etc/apache2/sites-enabled/{{ item }}"
     src: "/etc/apache2/sites-available/{{ item }}"
     state: link
   with_items:
@@ -114,7 +114,7 @@
     path: "{{ item }}"
     state: absent
   with_items:
-    - /etc/apache2/000-default.conf
+    - /etc/apache2/000-default.conf    # Not nec on Raspbian.  Is this really still needed elsewhere?
     - /etc/apache2/sites-enabled/000-default.conf
   when: is_debuntu
 
diff --git a/roles/openvpn/templates/announcer.j2 b/roles/openvpn/templates/announcer.j2
index 0b4a10a63..1e9dda958 100755
--- a/roles/openvpn/templates/announcer.j2
+++ b/roles/openvpn/templates/announcer.j2
@@ -4,15 +4,14 @@
 HANDLE=
 UUID=
 if [ -f /etc/iiab/openvpn_handle ]; then
-    # Option #0: Source directly from /etc/iiab/local_vars.yml in future?
-    # Option #1
+    # Option #1: Source directly from /etc/iiab/local_vars.yml in future?
+    # Option #2
     HANDLE=`cat /etc/iiab/openvpn_handle`
-    # Option #2: UUID is later used, if openvpn_handle is not set
 
 # Sourcing a variable from ~4 different places is a recipe for total confusion
 # (or worse!)  Far better to make variable openvpn_handle and file
-# /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, in which
-# case OpenVPN server should use /etc/iiab/uuid in lieu of the handle).
+# /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, IN WHICH
+# CASE OPENVPN SERVER TRIES TO USE /etc/iiab/uuid BELOW, IN LIEU OF HANDLE...)
 
 # CLARIF: "systemctl restart openvpn@xscenet" still runs even if the above is
 # defied.  e.g. if an implementer deletes /etc/iiab/openvpn_handle by accident.