diff --git a/weewx.conf b/weewx.conf
index e1eaca04..3e2b5a99 100644
--- a/weewx.conf
+++ b/weewx.conf
@@ -65,7 +65,6 @@ version = 2.6.3
 
 [Vantage]
     # This section is for a Davis VantagePro2, VantageVue or WeatherLinkIP
-    driver = weewx.drivers.vantage
 
     # Connection type: serial or ethernet 
     #  serial (the classic VantagePro)
@@ -110,11 +109,13 @@ version = 2.6.3
     # How many times to try before giving up:
     max_tries = 4
 
+    # The driver to use:
+    driver = weewx.drivers.vantage
+
 ##############################################################################
 
 [WMR100]
     # This section is for the Oregon Scientific WMR100
-    driver = weewx.drivers.wmr100
 
     # The station model, e.g., WMR100, WMR100N, WMRS200
     model = WMR100
@@ -122,20 +123,24 @@ version = 2.6.3
     # How long a wind record can be used to calculate wind chill (in seconds)
     stale_wind = 30
 
+    # The driver to use:
+    driver = weewx.drivers.wmr100
+
 ##############################################################################
 
 [WMR200]
     # This section is for the Oregon Scientific WMR200
-    driver = weewx.drivers.wmr200
 
     # The station model, e.g., WMR200, WMR200A, Radio Shack W200
     model = WMR200
 
+    # The driver to use:
+    driver = weewx.drivers.wmr200
+
 ##############################################################################
 
 [WMR9x8]
     # This section is for the Oregon Scientific WMR918/968
-    driver = weewx.drivers.wmr9x8
 
     # Connection type. For now, 'serial' is the only option. 
     type = serial
@@ -146,11 +151,13 @@ version = 2.6.3
     # The station model, e.g., WMR918, Radio Shack 63-1016
     model = WMR968
 
+    # The driver to use:
+    driver = weewx.drivers.wmr9x8
+
 ##############################################################################
 
 [FineOffsetUSB]
     # This section is for the Fine Offset series of weather stations.
-    driver = weewx.drivers.fousb
 
     # The station model, e.g., WH1080, WS1090, WS2080, WH3081
     model = WS2080
@@ -164,11 +171,13 @@ version = 2.6.3
     # The pressure calibration offset, in hPa (millibars)
     pressure_offset = 0
 
+    # The driver to use:
+    driver = weewx.drivers.fousb
+
 ##############################################################################
 
 [WS23xx]
     # This section is for the La Crosse WS-2300 series of weather stations.
-    driver = weewx.drivers.ws23xx
 
     # Serial port such as /dev/ttyS0, /dev/ttyUSB0, or /dev/cuaU0
     port = /dev/ttyUSB0
@@ -179,11 +188,13 @@ version = 2.6.3
     # The pressure calibration offset, in hPa (millibars)
     pressure_offset = 0
 
+    # The driver to use:
+    driver = weewx.drivers.ws23xx
+
 ##############################################################################
 
 [WS28xx]
     # This section is for the La Crosse WS-2800 series of weather stations.
-    driver = weewx.drivers.ws28xx
 
     # Radio frequency to use between USB transceiver and console: US or EU
     # US uses 915 MHz, EU uses 868.3 MHz.  Default is US.
@@ -195,15 +206,20 @@ version = 2.6.3
     # The pressure calibration offset, in hPa (millibars)
     pressure_offset = 0
 
+    # The driver to use:
+    driver = weewx.drivers.ws28xx
+
 ##############################################################################
 
 [TE923]
     # This section is for the Hideki TE923 series of weather stations.
-    driver = weewx.drivers.te923
 
     # The station model, e.g., 'Meade TE923W' or 'TFA Nexus'
     model = TE923
 
+    # The driver to use:
+    driver = weewx.drivers.te923
+
     # The default configuration associates the channel 1 sensor with outTemp
     # and outHumidity.  To change this, or to associate other channels with
     # specific columns in the database schema, use the following maps.
@@ -236,7 +252,6 @@ version = 2.6.3
 
 [Ultimeter]
     # This section is for the PeetBros Ultimeter series of weather stations.
-    driver = weewx.drivers.ultimeter
 
     # Serial port such as /dev/ttyS0, /dev/ttyUSB0, or /dev/cuaU0
     port = /dev/ttyUSB0
@@ -244,20 +259,24 @@ version = 2.6.3
     # The station model, e.g., Ultimeter 2000, Ultimeter 100
     model = Ultimeter
 
+    # The driver to use:
+    driver = weewx.drivers.ultimeter
+
 ##############################################################################
 
 [WS1]
     # This section is for the ADS WS1 series of weather stations.
-    driver = weewx.drivers.ws1
 
     # Serial port such as /dev/ttyS0, /dev/ttyUSB0, or /dev/cuaU0
     port = /dev/ttyUSB0
 
+    # The driver to use:
+    driver = weewx.drivers.ws1
+
 ##############################################################################
 
 [CC3000]
     # This section is for RainWise MarkIII weather stations and CC3000 logger.
-    driver = weewx.drivers.cc3000
 
     # Serial port such as /dev/ttyS0, /dev/ttyUSB0, or /dev/cuaU0
     port = /dev/ttyUSB0
@@ -265,11 +284,13 @@ version = 2.6.3
     # The station model, e.g., CC3000 or CC3000R
     model = CC3000
 
+    # The driver to use:
+    driver = weewx.drivers.cc3000
+
 ##############################################################################
 
 [Simulator]
     # This section for the weewx weather station simulator
-    driver = weewx.drivers.simulator
 
     # The time (in seconds) between LOOP packets.
     loop_interval = 2.5
@@ -283,6 +304,9 @@ version = 2.6.3
     # The start time. If not specified, the default is to use the present time.
     #start = 2011-01-01 00:00
 
+    # The driver to use:
+    driver = weewx.drivers.simulator
+
 ##############################################################################
 
 [StdRESTful]