diff --git a/lib/options.nix b/lib/options.nix
index 8ea9df3cbd6..a91115287e4 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -31,7 +31,7 @@ rec {
   mkEnableOption = name: mkOption {
     default = false;
     example = true;
-    description = "Whether to enable ${name}";
+    description = "Whether to enable ${name}.";
     type = lib.types.bool;
   };
 
@@ -272,9 +272,7 @@ rec {
         let
           docOption = {
             inherit (opt) name;
-            description = if opt ? description then opt.description else
-              throw "Option ${opt.name}: No description.";
-
+            description = opt.description or (throw "Option ${opt.name}: No description.");
             declarations = map (x: toString x.source) opt.declarations;
             #definitions = map (x: toString x.source) opt.definitions;
           }
@@ -297,7 +295,7 @@ rec {
      generation of `options.xml' much more efficient: the XML
      representation of derivations is very large (on the order of
      megabytes) and is not actually used by the manual generator. */
-  scrubOptionValue = x: 
+  scrubOptionValue = x:
     if isDerivation x then { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
     else if isList x then map scrubOptionValue x
     else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index fa3de7d90bc..553110d7b80 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -51,7 +51,7 @@ in {
 
     enableWebService = mkEnableOption "the uptime monitoring program web service";
 
-    enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service (default: enableWebService == true)" // { default = cfg.enableWebService; };
+    enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service" // { default = cfg.enableWebService; };
 
     nodeEnv = mkOption {
       description = "The node environment to run in (development, production, etc.)";