diff --git a/repmgr-client-global.h b/repmgr-client-global.h
index 7a27af14..88408127 100644
--- a/repmgr-client-global.h
+++ b/repmgr-client-global.h
@@ -141,7 +141,7 @@ typedef struct
 
 	/* following options for internal use */
 	char		config_archive_dir[MAXPGPATH];
-	OutputMode	output_mode;
+	OutputMode	output_mode; /* set through provision of --csv, --nagios or --optformat */
 	bool		disable_wal_receiver;
 	bool		enable_wal_receiver;
 } t_runtime_options;
diff --git a/repmgr-client.h b/repmgr-client.h
index 5bdd1adc..0ce23b61 100644
--- a/repmgr-client.h
+++ b/repmgr-client.h
@@ -83,24 +83,27 @@
 #define OPT_DOWNSTREAM					   1030
 #define OPT_UPSTREAM					   1031
 #define OPT_SLOTS						   1032
-#define OPT_CONFIG_ARCHIVE_DIR			   1033
-#define OPT_HAS_PASSFILE				   1034
-#define OPT_WAIT_START					   1035
-#define OPT_REPL_CONN					   1036
-#define OPT_REMOTE_NODE_ID				   1037
-#define OPT_REPLICATION_CONF_ONLY		   1038
-#define OPT_NO_WAIT						   1039
-#define OPT_MISSING_SLOTS				   1040
-#define OPT_REPMGRD_NO_PAUSE			   1041
-#define OPT_VERSION_NUMBER				   1042
-#define OPT_DATA_DIRECTORY_CONFIG		   1043
-#define OPT_COMPACT						   1044
-#define OPT_DISABLE_WAL_RECEIVER		   1045
-#define OPT_ENABLE_WAL_RECEIVER			   1046
-#define OPT_DETAIL						   1047
-#define OPT_REPMGRD_FORCE_UNPAUSE		   1048
-#define OPT_REPLICATION_CONFIG_OWNER	   1049
-#define OPT_DB_CONNECTION				   1050
+#define OPT_HAS_PASSFILE				   1033
+#define OPT_WAIT_START					   1034
+#define OPT_REPL_CONN					   1035
+#define OPT_REMOTE_NODE_ID				   1036
+#define OPT_REPLICATION_CONF_ONLY		   1037
+#define OPT_NO_WAIT						   1038
+#define OPT_MISSING_SLOTS				   1039
+#define OPT_REPMGRD_NO_PAUSE			   1040
+#define OPT_VERSION_NUMBER				   1041
+#define OPT_DATA_DIRECTORY_CONFIG		   1042
+#define OPT_COMPACT						   1043
+#define OPT_DETAIL						   1044
+#define OPT_REPMGRD_FORCE_UNPAUSE		   1045
+#define OPT_REPLICATION_CONFIG_OWNER	   1046
+#define OPT_DB_CONNECTION				   1047
+
+/* These options are for internal use only */
+#define OPT_CONFIG_ARCHIVE_DIR			   2001
+#define OPT_DISABLE_WAL_RECEIVER		   2002
+#define OPT_ENABLE_WAL_RECEIVER			   2003
+
 
 /* deprecated since 4.0 */
 #define OPT_CHECK_UPSTREAM_CONFIG		    999