diff --git a/.gitignore b/.gitignore
index a92e6c1f7d2..e59225d6c10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,9 @@ ld_map.txt
 # generated help files
 *.help.xml.h
 .idea/**/*.xml
-# generated cxx files
+
+# generated source files
+utils/version_info.h
 qdec/QdecLibInit.cxx
 qdec/vtkKWQdecAppTcl.cxx
 qdec/vtkKWQdecViewTcl.cxx
diff --git a/AntsDenoiseImageFs/AntsDenoiseImageFs.cpp b/AntsDenoiseImageFs/AntsDenoiseImageFs.cpp
index 27328d2cdca..380a1f4b4f8 100644
--- a/AntsDenoiseImageFs/AntsDenoiseImageFs.cpp
+++ b/AntsDenoiseImageFs/AntsDenoiseImageFs.cpp
@@ -24,7 +24,7 @@
 #include "AntsDenoiseImageFs.help.xml.h"
 
 
-int main(int argc, char const *argv[])
+int main(int argc, char **argv)
 {
   // parse args
   ArgumentParser parser;
diff --git a/AntsN4BiasFieldCorrectionFs/AntsN4BiasFieldCorrectionFs.cpp b/AntsN4BiasFieldCorrectionFs/AntsN4BiasFieldCorrectionFs.cpp
index 4c3a11d5d8b..ae9cbf6d10d 100644
--- a/AntsN4BiasFieldCorrectionFs/AntsN4BiasFieldCorrectionFs.cpp
+++ b/AntsN4BiasFieldCorrectionFs/AntsN4BiasFieldCorrectionFs.cpp
@@ -25,7 +25,7 @@
 #include "AntsN4BiasFieldCorrectionFs.help.xml.h"
 
 
-int main(int argc, char const *argv[])
+int main(int argc, char **argv)
 {
   // parse args
   ArgumentParser parser;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e3887482d2..9a2ef322614 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,9 +38,12 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   endif()
 endif()
 
-# create build stamp during install
+# version stamp
+set(FS_VERSION "$ENV{USER}-local" CACHE STRING "Distribution version")
+
+# build stamp
 string(TIMESTAMP TODAY "%Y%m%d")
-set(BUILD_STAMP "freesurfer-local-build-dev-${TODAY}" CACHE STRING "Distribution build stamp")
+set(BUILD_STAMP "freesurfer-local-build-${TODAY}" CACHE STRING "Distribution build stamp")
 install(CODE "file(WRITE ${CMAKE_INSTALL_PREFIX}/build-stamp.txt ${BUILD_STAMP}\\n)")
 
 # set the default build type to 'Release' for optimization purposes
@@ -287,6 +290,7 @@ add_subdirectory(distribution)
 # the top-level include dir contain the most commonly included freesurfer header files
 set(FS_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_BINARY_DIR}/include
   ${CMAKE_SOURCE_DIR}/packages/minc
   ${CMAKE_SOURCE_DIR}/packages/netcdf
   ${CMAKE_SOURCE_DIR}/packages/nifti
diff --git a/attic/check_siemens_dir/check_siemens_dir.cpp b/attic/check_siemens_dir/check_siemens_dir.cpp
index 095cc6b6d91..417df8c77da 100644
--- a/attic/check_siemens_dir/check_siemens_dir.cpp
+++ b/attic/check_siemens_dir/check_siemens_dir.cpp
@@ -61,11 +61,7 @@ int main(int argc, char *argv[]) {
   DIR *dp;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: check_siemens_dir.c,v 1.10 2011/03/02 00:04:01 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "check_siemens_dir");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/dmri_tensoreig/dmri_tensoreig.cpp b/attic/dmri_tensoreig/dmri_tensoreig.cpp
index e9c131dbb11..a057c0b566f 100644
--- a/attic/dmri_tensoreig/dmri_tensoreig.cpp
+++ b/attic/dmri_tensoreig/dmri_tensoreig.cpp
@@ -103,8 +103,7 @@ int main(int argc, char *argv[]) {
   char outfile[1024];
   const double minexp = exp(-10^35);
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name$");
+  nargs = handleVersionOption(argc, argv, "dmri_tensoreig");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/attic/histo_fix_topology/histo_fix_topology.cpp b/attic/histo_fix_topology/histo_fix_topology.cpp
index 31707450991..dc60ce20c83 100644
--- a/attic/histo_fix_topology/histo_fix_topology.cpp
+++ b/attic/histo_fix_topology/histo_fix_topology.cpp
@@ -67,8 +67,7 @@ main(int argc, char *argv[]) {
   MRI_SEGMENT       *ms ;
   MRI_SEGMENT_VOXEL *msv ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: histo_fix_topology.c,v 1.3 2011/03/02 00:04:09 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "histo_fix_topology");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/histo_segment/histo_segment.cpp b/attic/histo_segment/histo_segment.cpp
index 1d46b958380..783ea6f7561 100644
--- a/attic/histo_segment/histo_segment.cpp
+++ b/attic/histo_segment/histo_segment.cpp
@@ -69,8 +69,7 @@ main(int argc, char *argv[]) {
   double      thresh, min_neuron_area ;
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: histo_segment.c,v 1.2 2011/03/02 00:04:09 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "histo_segment");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/label_area/label_area.cpp b/attic/label_area/label_area.cpp
index faab9a78820..fe7f163cc6a 100644
--- a/attic/label_area/label_area.cpp
+++ b/attic/label_area/label_area.cpp
@@ -64,8 +64,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   float        area ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: label_area.c,v 1.9 2012/04/25 13:37:44 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "label_area");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/label_border/label_border.cpp b/attic/label_border/label_border.cpp
index 72765394483..5943a16c45b 100644
--- a/attic/label_border/label_border.cpp
+++ b/attic/label_border/label_border.cpp
@@ -62,8 +62,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   LABEL        *area ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: label_border.c,v 1.2 2011/03/02 00:04:11 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "label_border");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_apply_inu_correction/mri_apply_inu_correction.cpp b/attic/mri_apply_inu_correction/mri_apply_inu_correction.cpp
index 3c06970a146..48b3aaece06 100644
--- a/attic/mri_apply_inu_correction/mri_apply_inu_correction.cpp
+++ b/attic/mri_apply_inu_correction/mri_apply_inu_correction.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *argv[]) {
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_apply_inu_correction.c,v 1.3 2011/03/02 00:04:13 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_apply_inu_correction");
   argc -= nargs ;
 
   ac = argc ;
diff --git a/attic/mri_aseg_edit_reclassify/mri_aseg_edit_reclassify.cpp b/attic/mri_aseg_edit_reclassify/mri_aseg_edit_reclassify.cpp
index 2cc4a6e4d38..475fd91d30a 100644
--- a/attic/mri_aseg_edit_reclassify/mri_aseg_edit_reclassify.cpp
+++ b/attic/mri_aseg_edit_reclassify/mri_aseg_edit_reclassify.cpp
@@ -87,8 +87,7 @@ main(int argc, char *argv[]) {
   VOXEL_LIST   *vl_border ;
   float        *svm_inputs = NULL, svm_out ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_aseg_edit_reclassify.c,v 1.5 2011/03/02 00:04:13 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_aseg_edit_reclassify");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_aseg_edit_train/mri_aseg_edit_train.cpp b/attic/mri_aseg_edit_train/mri_aseg_edit_train.cpp
index b2aa2e94682..809810ff8dc 100644
--- a/attic/mri_aseg_edit_train/mri_aseg_edit_train.cpp
+++ b/attic/mri_aseg_edit_train/mri_aseg_edit_train.cpp
@@ -227,8 +227,7 @@ main(int argc, char *argv[]) {
   }
 #endif
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_aseg_edit_train.c,v 1.3 2011/03/02 00:04:13 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_aseg_edit_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_auto_fill/mri_auto_fill.cpp b/attic/mri_auto_fill/mri_auto_fill.cpp
index 1d9a1c0c573..5dafc5d4ebb 100644
--- a/attic/mri_auto_fill/mri_auto_fill.cpp
+++ b/attic/mri_auto_fill/mri_auto_fill.cpp
@@ -87,11 +87,7 @@ main(int argc, char *argv[])
   GCAM   *gcam;
   int     msec ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_auto_fill.c,v 1.14 2011/03/02 00:04:13 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_auto_fill");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_bc_sc_bias_correct/mri_bc_sc_bias_correct.cpp b/attic/mri_bc_sc_bias_correct/mri_bc_sc_bias_correct.cpp
index 2331561f30b..316fcaa8a6f 100644
--- a/attic/mri_bc_sc_bias_correct/mri_bc_sc_bias_correct.cpp
+++ b/attic/mri_bc_sc_bias_correct/mri_bc_sc_bias_correct.cpp
@@ -62,9 +62,8 @@ main(int argc, char *argv[]) {
   HISTOGRAM        *histo ;
   MRI_SEGMENTATION *mriseg ;
 
-  /* rkt: check for and handle version tag */
   Progname = argv[0] ;
-  nargs = handle_version_option (argc, argv, "$Id: mri_bc_sc_bias_correct.c,v 1.5 2011/03/02 00:04:13 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_bc_sc_bias_correct");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_build_priors/mri_build_priors.cpp b/attic/mri_build_priors/mri_build_priors.cpp
index d6bdcbc9fa9..b1c32753bae 100644
--- a/attic/mri_build_priors/mri_build_priors.cpp
+++ b/attic/mri_build_priors/mri_build_priors.cpp
@@ -56,8 +56,7 @@ main(int argc, char *argv[]) {
   int    fno, nfiles ;
   MRI    *mri_src, *mri_target, *mri_wm, *mri_priors = NULL ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_build_priors.c,v 1.8 2011/03/02 00:04:13 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_build_priors");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_classify/mri_classify.cpp b/attic/mri_classify/mri_classify.cpp
index d5b8910b723..5b8c26e2731 100644
--- a/attic/mri_classify/mri_classify.cpp
+++ b/attic/mri_classify/mri_classify.cpp
@@ -70,8 +70,7 @@ main(int argc, char *argv[]) {
   char    *training_file_name, *output_file_name ;
   int     nargs, error, i ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_classify.c,v 1.2 2012/05/23 19:24:37 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_classify");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_compute_structure_transforms/mri_compute_structure_transforms.cpp b/attic/mri_compute_structure_transforms/mri_compute_structure_transforms.cpp
index c6ea60006a9..6443f36e7cc 100644
--- a/attic/mri_compute_structure_transforms/mri_compute_structure_transforms.cpp
+++ b/attic/mri_compute_structure_transforms/mri_compute_structure_transforms.cpp
@@ -67,8 +67,7 @@ main(int argc, char *argv[]) {
   MRI            *mri_aseg ;
   float          xa, ya, za ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_compute_structure_transforms.c,v 1.3 2011/03/02 00:04:14 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_structure_transforms");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_convert_mdh/mri_convert_mdh.cpp b/attic/mri_convert_mdh/mri_convert_mdh.cpp
index 6bc22a0c210..f0bd9fc89bb 100644
--- a/attic/mri_convert_mdh/mri_convert_mdh.cpp
+++ b/attic/mri_convert_mdh/mri_convert_mdh.cpp
@@ -254,8 +254,7 @@ int main(int argc, char **argv) {
   //DumpMDH_VB13(argv[1]);
   return(0);
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_convert_mdh.c,v 1.27 2011/03/02 00:04:14 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_convert_mdh");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_divide_segmentation/mri_divide_segmentation.cpp b/attic/mri_divide_segmentation/mri_divide_segmentation.cpp
index 8aff42dda88..d2d4c74974f 100644
--- a/attic/mri_divide_segmentation/mri_divide_segmentation.cpp
+++ b/attic/mri_divide_segmentation/mri_divide_segmentation.cpp
@@ -66,7 +66,7 @@ main(int argc, char *argv[]) {
   MATRIX       *m_obs, *m_obs_T, *m_cov, *m_eig ;
 
   setRandomSeed(-1L) ;
-  nargs = handle_version_option (argc, argv, "$Id: mri_divide_segmentation.c,v 1.3 2014/05/28 20:27:57 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_divide_segmentation");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_elastic_energy/mri_elastic_energy.cpp b/attic/mri_elastic_energy/mri_elastic_energy.cpp
index 03f66619ec2..333a1d7a643 100644
--- a/attic/mri_elastic_energy/mri_elastic_energy.cpp
+++ b/attic/mri_elastic_energy/mri_elastic_energy.cpp
@@ -60,8 +60,7 @@ main(int argc, char *argv[]) {
   GCA_MORPH    *gcam ;
   MRI          *mri_lame ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_elastic_energy.c,v 1.2 2011/10/16 17:00:35 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_elastic_energy");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_estimate_tissue_parms/mri_estimate_tissue_parms.cpp b/attic/mri_estimate_tissue_parms/mri_estimate_tissue_parms.cpp
index 581fa80d8be..7a7d27901c1 100644
--- a/attic/mri_estimate_tissue_parms/mri_estimate_tissue_parms.cpp
+++ b/attic/mri_estimate_tissue_parms/mri_estimate_tissue_parms.cpp
@@ -109,8 +109,7 @@ main(int argc, char *argv[]) {
   int          msec, minutes, seconds, nvolumes ;
   Timer start ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_estimate_tissue_parms.c,v 1.10 2015/03/12 20:24:06 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_estimate_tissue_parms");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_extract_conditions/mri_extract_conditions.cpp b/attic/mri_extract_conditions/mri_extract_conditions.cpp
index 861c4cc0646..285e27eb49f 100644
--- a/attic/mri_extract_conditions/mri_extract_conditions.cpp
+++ b/attic/mri_extract_conditions/mri_extract_conditions.cpp
@@ -63,8 +63,7 @@ main(int argc, char *argv[]) {
   MRI         *mri_in, *mri_out ;
   FILE        *fp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_extract_conditions.c,v 1.5 2011/03/02 00:04:15 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_extract_conditions");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_fcili/mri_fcili.cpp b/attic/mri_fcili/mri_fcili.cpp
index de250e56d71..00c34d90fdb 100644
--- a/attic/mri_fcili/mri_fcili.cpp
+++ b/attic/mri_fcili/mri_fcili.cpp
@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {
   int c,f, nrois, roi1, roi2, nframes;
   double v,ss, v1,v2,den,num, LL, LR, RL, RR;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fcili");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/attic/mri_gcab_train/mri_gcab_train.cpp b/attic/mri_gcab_train/mri_gcab_train.cpp
index d2b95fbcbec..66f25cf5d27 100644
--- a/attic/mri_gcab_train/mri_gcab_train.cpp
+++ b/attic/mri_gcab_train/mri_gcab_train.cpp
@@ -115,11 +115,7 @@ main(int argc, char *argv[]) {
   parms.use_gradient = 0 ;
   spacing = 8 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mri_gcab_train.c,v 1.4 2011/03/16 20:23:33 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_gcab_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_gdfglm/mri_gdfglm.cpp b/attic/mri_gdfglm/mri_gdfglm.cpp
index b18c7222d0b..8541948e66e 100644
--- a/attic/mri_gdfglm/mri_gdfglm.cpp
+++ b/attic/mri_gdfglm/mri_gdfglm.cpp
@@ -152,8 +152,7 @@ int main(int argc, char **argv) {
   char OutGDFile[2000];
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_gdfglm.c,v 1.9 2011/05/05 15:28:03 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_gdfglm");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_histo_normalize/mri_histo_normalize.cpp b/attic/mri_histo_normalize/mri_histo_normalize.cpp
index cb1d3d54d0d..f2c84e71f8e 100644
--- a/attic/mri_histo_normalize/mri_histo_normalize.cpp
+++ b/attic/mri_histo_normalize/mri_histo_normalize.cpp
@@ -66,11 +66,7 @@ main(int argc, char *argv[]) {
   HISTOGRAM    *histos[MAX_SUBJECTS], *htemplate ;
   double       rms, rms_avg ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_histo_normalize.c,v 1.3 2011/03/02 00:04:19 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_histo_normalize");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_ibmc/mri_ibmc.cpp b/attic/mri_ibmc/mri_ibmc.cpp
index b02f6136665..b899021f376 100644
--- a/attic/mri_ibmc/mri_ibmc.cpp
+++ b/attic/mri_ibmc/mri_ibmc.cpp
@@ -712,7 +712,7 @@ int main(int argc, char *argv[])
   ibmc = (IBMC *) calloc(sizeof(IBMC),1);
   ibmc->DoSmooth = 0;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ibmc");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/attic/mri_interpolate/mri_interpolate.cpp b/attic/mri_interpolate/mri_interpolate.cpp
index dfae57171f0..ec2baaf9601 100644
--- a/attic/mri_interpolate/mri_interpolate.cpp
+++ b/attic/mri_interpolate/mri_interpolate.cpp
@@ -63,13 +63,15 @@ main(int argc, char *argv[]) {
   char         *in_fname, *out_fname, **av ;
   MRI          *mri_in, *mri_ctrl, *mri_out;
   int          ac, nargs=0, x, y, z ;
-  char         cmdline[CMD_LINE_LEN] ;
   double       val;
 
   make_cmd_version_string
     (argc, argv,
      "$Id: mri_interpolate.c,v 1.5 2011/10/06 01:18:12 fischl Exp $",
      "$Name:  $",cmdline);
+  make_cmd_version_string
+  std::string cmdline = getAllInfo(argc, argv, "mri_interpolate");
+
   setRandomSeed(-1L) ;
   Progname = argv[0] ;
 
diff --git a/attic/mri_label_accuracy/mri_label_accuracy.cpp b/attic/mri_label_accuracy/mri_label_accuracy.cpp
index a1571362572..1819321d4f6 100644
--- a/attic/mri_label_accuracy/mri_label_accuracy.cpp
+++ b/attic/mri_label_accuracy/mri_label_accuracy.cpp
@@ -71,8 +71,7 @@ main(int argc, char *argv[]) {
   double accuracy ;
   MRI_REGION box ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_label_accuracy.c,v 1.2 2011/03/02 00:04:22 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_label_accuracy");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_make_bem_surfaces/mri_make_bem_surfaces.cpp b/attic/mri_make_bem_surfaces/mri_make_bem_surfaces.cpp
index 001865817be..d33e0bfeb67 100644
--- a/attic/mri_make_bem_surfaces/mri_make_bem_surfaces.cpp
+++ b/attic/mri_make_bem_surfaces/mri_make_bem_surfaces.cpp
@@ -184,8 +184,7 @@ main(int argc,char *argv[])
   /* struct stat buf; */
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_make_bem_surfaces.c,v 1.13 2011/03/29 16:37:02 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_make_bem_surfaces");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/attic/mri_make_density_map/mri_make_density_map.cpp b/attic/mri_make_density_map/mri_make_density_map.cpp
index d2e62b6e56c..15a1e82c2b2 100644
--- a/attic/mri_make_density_map/mri_make_density_map.cpp
+++ b/attic/mri_make_density_map/mri_make_density_map.cpp
@@ -77,8 +77,7 @@ main(int argc, char *argv[]) {
   GCA_MORPH   *gcam ;
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_make_density_map.c,v 1.8 2011/03/02 00:04:22 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_make_density_map");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_make_register/mri_make_register.cpp b/attic/mri_make_register/mri_make_register.cpp
index db69aea8520..cd8fa9abe1c 100644
--- a/attic/mri_make_register/mri_make_register.cpp
+++ b/attic/mri_make_register/mri_make_register.cpp
@@ -89,8 +89,7 @@ int main(int argc, char *argv[]) {
   int i;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_make_register.c,v 1.9 2011/03/02 00:04:22 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_make_register");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_make_template/mri_make_template.cpp b/attic/mri_make_template/mri_make_template.cpp
index a447822db61..2d9aa9bb574 100644
--- a/attic/mri_make_template/mri_make_template.cpp
+++ b/attic/mri_make_template/mri_make_template.cpp
@@ -121,8 +121,7 @@ main(int argc, char *argv[]) {
   /*  LTA    *lta;*/
   MRI *mri_tmp=0 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_make_template.c,v 1.26 2011/03/02 00:04:22 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_make_template");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_map_atrophy/mri_map_atrophy.c b/attic/mri_map_atrophy/mri_map_atrophy.c
index c70e8472e9f..0d1a368b537 100644
--- a/attic/mri_map_atrophy/mri_map_atrophy.c
+++ b/attic/mri_map_atrophy/mri_map_atrophy.c
@@ -84,8 +84,7 @@ main(int argc, char *argv[]) {
   MRI         *mri_time1, *mri_time2, *mri_tmp, *mri_atrophy ;
   TRANSFORM   *transform1, *transform2 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_map_atrophy.c,v 1.4 2011/03/02 00:04:22 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_map_atrophy");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_mosaic/mri_mosaic.cpp b/attic/mri_mosaic/mri_mosaic.cpp
index bd1c9eef48a..45e06bc38cf 100644
--- a/attic/mri_mosaic/mri_mosaic.cpp
+++ b/attic/mri_mosaic/mri_mosaic.cpp
@@ -61,8 +61,7 @@ main(int argc, char *argv[]) {
   Timer start ;
   MRI          *mri[MAX_INPUT_IMAGES], *mri_mosaic ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_mosaic.c,v 1.1 2015/09/25 16:05:20 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_mosaic");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_ms_EM/mri_ms_EM.cpp b/attic/mri_ms_EM/mri_ms_EM.cpp
index c1427edac2a..894fa2c6b1d 100644
--- a/attic/mri_ms_EM/mri_ms_EM.cpp
+++ b/attic/mri_ms_EM/mri_ms_EM.cpp
@@ -217,11 +217,7 @@ main(int argc, char *argv[])
   unsigned long NRindex[MAX_CLASSES+1];
   int indexmap[MAX_CLASSES + 1];
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (
-    argc, argv,
-    "$Id: mri_ms_EM.c,v 1.8 2011/10/04 18:37:30 nicks Exp $",
-    "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ms_EM");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/attic/mri_ms_EM_with_atlas/mri_ms_EM_with_atlas.cpp b/attic/mri_ms_EM_with_atlas/mri_ms_EM_with_atlas.cpp
index 13ce6a675a2..219847df292 100644
--- a/attic/mri_ms_EM_with_atlas/mri_ms_EM_with_atlas.cpp
+++ b/attic/mri_ms_EM_with_atlas/mri_ms_EM_with_atlas.cpp
@@ -251,8 +251,7 @@ main(int argc, char *argv[])
   unsigned long NRindex[MAX_CLASSES+1];
   int indexmap[MAX_CLASSES + 1];
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_ms_EM_with_atlas.c,v 1.10 2011/10/25 14:13:02 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ms_EM_with_atlas");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/attic/mri_ms_LDA/mri_ms_LDA.cpp b/attic/mri_ms_LDA/mri_ms_LDA.cpp
index 45f761e5a7f..87c08694964 100644
--- a/attic/mri_ms_LDA/mri_ms_LDA.cpp
+++ b/attic/mri_ms_LDA/mri_ms_LDA.cpp
@@ -135,8 +135,7 @@ main(int argc, char *argv[]) {
   double sum_white, sum_gray;
   int count_white, count_gray;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_ms_LDA.c,v 1.4 2011/03/02 00:04:23 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ms_LDA");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_multiscale_segment/mri_multiscale_segment.cpp b/attic/mri_multiscale_segment/mri_multiscale_segment.cpp
index 60f9d2672e8..dc448ad0513 100644
--- a/attic/mri_multiscale_segment/mri_multiscale_segment.cpp
+++ b/attic/mri_multiscale_segment/mri_multiscale_segment.cpp
@@ -65,8 +65,7 @@ main(int argc, char *argv[]) {
   TRANSFORM    *transform ;
   MRI_SURFACE  *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_multiscale_segment.c,v 1.1 2011/07/31 14:22:07 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_multiscale_segment");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_parselabel/mri_parselabel.cpp b/attic/mri_parselabel/mri_parselabel.cpp
index bd2d0fc3ce7..6757f637e7e 100644
--- a/attic/mri_parselabel/mri_parselabel.cpp
+++ b/attic/mri_parselabel/mri_parselabel.cpp
@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
   int nargs;
   Progname=argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_parselabel.cpp,v 1.18 2011/03/02 00:04:23 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_parselabel");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_partial_ribbon/mri_partial_ribbon.cpp b/attic/mri_partial_ribbon/mri_partial_ribbon.cpp
index d430e741c7e..e1e51d06254 100644
--- a/attic/mri_partial_ribbon/mri_partial_ribbon.cpp
+++ b/attic/mri_partial_ribbon/mri_partial_ribbon.cpp
@@ -54,11 +54,7 @@ int main(int argc, char *argv[]) {
   MRI_SURFACE *inner_mris_lh,*outer_mris_lh,*inner_mris_rh,*outer_mris_rh;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_partial_ribbon.c,v 1.11 2011/03/02 00:04:23 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_partial_ribbon");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_register/mri_register.cpp b/attic/mri_register/mri_register.cpp
index e9f9fd3979a..74c73114d6d 100644
--- a/attic/mri_register/mri_register.cpp
+++ b/attic/mri_register/mri_register.cpp
@@ -332,10 +332,7 @@ main(int argc, char *argv[]) {
   DiagInit(NULL, NULL, NULL) ;
   ErrorInit(NULL, NULL, NULL) ;
 
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_register.c,v 1.26 2014/02/07 22:46:21 greve Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_register");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_rf_long_label/mri_rf_long_label.cpp b/attic/mri_rf_long_label/mri_rf_long_label.cpp
index ad9a1f43854..680b6be00d8 100644
--- a/attic/mri_rf_long_label/mri_rf_long_label.cpp
+++ b/attic/mri_rf_long_label/mri_rf_long_label.cpp
@@ -116,18 +116,10 @@ main(int argc, char *argv[])
   RFA          *rfa = NULL ;
   RANDOM_FOREST *rf = NULL ;  // if single_classifier_flag is true
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_rf_long_label.c,v 1.1 2012/06/13 20:47:45 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_rf_long_label.c,v 1.1 2012/06/13 20:47:45 fischl Exp $",
-           "$Name:  $");
+
+  std::string cmdline = getAllInfo(argc, argv, "mri_rf_long_label");
+
+  nargs = handleVersionOption(argc, argv, "mri_rf_long_label");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/attic/mri_segment_tumor/mri_segment_tumor.cpp b/attic/mri_segment_tumor/mri_segment_tumor.cpp
index e789ed4ba57..418e22e0385 100644
--- a/attic/mri_segment_tumor/mri_segment_tumor.cpp
+++ b/attic/mri_segment_tumor/mri_segment_tumor.cpp
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
   GCA       *gca ;
   TRANSFORM *xform ;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_segment_tumor");
 
   if (nargs && argc - nargs == 1) 
     exit (0);
diff --git a/attic/mri_simulate_atrophy/mri_simulate_atrophy.cpp b/attic/mri_simulate_atrophy/mri_simulate_atrophy.cpp
index 8f250cb9f86..7961172bc6e 100644
--- a/attic/mri_simulate_atrophy/mri_simulate_atrophy.cpp
+++ b/attic/mri_simulate_atrophy/mri_simulate_atrophy.cpp
@@ -71,12 +71,7 @@ main(int argc, char *argv[])
   Timer start ;
   MRI         *mri_aseg, *mri_norm, *mri_norm_atrophy, *mri_noise ;
 
-  /* rkt: check for and handle version tag */
-  nargs = 
-    handle_version_option
-    (argc, argv,
-     "$Id: mri_simulate_atrophy.c,v 1.6 2014/07/24 21:37:18 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_simulate_atrophy");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_threshold/mri_threshold.cpp b/attic/mri_threshold/mri_threshold.cpp
index 45a5c44341e..d92a06a56a4 100644
--- a/attic/mri_threshold/mri_threshold.cpp
+++ b/attic/mri_threshold/mri_threshold.cpp
@@ -60,12 +60,10 @@ main(int argc, char *argv[]) {
   MRI         *mri_in, *mri_out ;
   float       thresh ;
 
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string (argc, argv, "$Id: mri_threshold.c,v 1.10 2015/09/02 18:33:01 lzollei Exp $", "$Name:  $", cmdline);
-  /* rkt: check for and handle version tag */
+  std::string cmdline = getAllInfo(argc, argv, "mri_threshold");
   Progname = argv[0] ;
-  nargs = handle_version_option (argc, argv, "$Id: mri_threshold.c,v 1.10 2015/09/02 18:33:01 lzollei Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_threshold");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_train_autoencoder/mri_apply_autoencoder.cpp b/attic/mri_train_autoencoder/mri_apply_autoencoder.cpp
index 9ecb68abd20..b914508e488 100644
--- a/attic/mri_train_autoencoder/mri_apply_autoencoder.cpp
+++ b/attic/mri_train_autoencoder/mri_apply_autoencoder.cpp
@@ -91,8 +91,7 @@ main(int argc, char *argv[]) {
   double       mean, train_mean ;
   AE           *ae_last ; // deepest layer
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_apply_autoencoder.c,v 1.2 2013/11/22 19:41:39 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_apply_autoencoder");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_train_autoencoder/mri_train_autoencoder.cpp b/attic/mri_train_autoencoder/mri_train_autoencoder.cpp
index e16dbbd0f77..07959a60067 100644
--- a/attic/mri_train_autoencoder/mri_train_autoencoder.cpp
+++ b/attic/mri_train_autoencoder/mri_train_autoencoder.cpp
@@ -92,8 +92,7 @@ main(int argc, char *argv[]) {
   memset(&parms, 0, sizeof(parms)) ;
   parms.integration_type  = INTEGRATE_GRADIENT_DESCENT ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_train_autoencoder.c,v 1.2 2013/11/14 16:17:41 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_train_autoencoder");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_transform_to_COR/mri_transform_to_COR.cpp b/attic/mri_transform_to_COR/mri_transform_to_COR.cpp
index 836e70dff60..615082b2b3c 100644
--- a/attic/mri_transform_to_COR/mri_transform_to_COR.cpp
+++ b/attic/mri_transform_to_COR/mri_transform_to_COR.cpp
@@ -124,8 +124,7 @@ main(int argc, char *argv[]) {
   float fmin, fmax, val, peak, smooth_peak;
   int i, nbins, bin;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_transform_to_COR.c,v 1.4 2014/04/04 19:58:54 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_transform_to_COR");
   if (nargs && argc - nargs == 1)
     usage_exit (0);
   argc -= nargs;
diff --git a/attic/mri_update_gca/mri_update_gca.cpp b/attic/mri_update_gca/mri_update_gca.cpp
index 59cf0b10ce8..3de96b1b70d 100644
--- a/attic/mri_update_gca/mri_update_gca.cpp
+++ b/attic/mri_update_gca/mri_update_gca.cpp
@@ -56,8 +56,7 @@ main(int argc, char *argv[]) {
   GCA          *gca ;
   MRI          *mri_norm, *mri_aseg ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_update_gca.c,v 1.2 2011/06/29 19:35:58 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_update_gca");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_vol2roi/mri_vol2roi.cpp b/attic/mri_vol2roi/mri_vol2roi.cpp
index cefeac9ed63..e9eed1e6a59 100644
--- a/attic/mri_vol2roi/mri_vol2roi.cpp
+++ b/attic/mri_vol2roi/mri_vol2roi.cpp
@@ -161,8 +161,7 @@ int main(int argc, char **argv) {
   int nargs;
   //int endian,roitype;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_vol2roi.c,v 1.32 2011/03/02 00:04:25 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_vol2roi");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_wmfilter/mri_wmfilter.cpp b/attic/mri_wmfilter/mri_wmfilter.cpp
index 34b847740d1..f643902a3e1 100644
--- a/attic/mri_wmfilter/mri_wmfilter.cpp
+++ b/attic/mri_wmfilter/mri_wmfilter.cpp
@@ -104,8 +104,7 @@ main(int argc,char *argv[]) {
   char  *data_dir,*mri_dir;
   MRI   *mri_src, *mri_dst ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_wmfilter.c,v 1.18 2011/03/02 00:04:26 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_wmfilter");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mri_xcorr/mri_xcorr.cpp b/attic/mri_xcorr/mri_xcorr.cpp
index f286b05637a..d9790a0dc00 100644
--- a/attic/mri_xcorr/mri_xcorr.cpp
+++ b/attic/mri_xcorr/mri_xcorr.cpp
@@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
   int nargs;
   MRI *v1=NULL, *v2=NULL, *mask=NULL, *xcorr=NULL;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_xcorr");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/attic/mris_add_template/mris_add_template.cpp b/attic/mris_add_template/mris_add_template.cpp
index 63d22fb4565..8fbcd671860 100644
--- a/attic/mris_add_template/mris_add_template.cpp
+++ b/attic/mris_add_template/mris_add_template.cpp
@@ -70,8 +70,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   MRI_SP       *mrisp, *mrisp_template ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_add_template.c,v 1.8 2011/03/02 00:04:26 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_add_template");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_aseg_distance/mris_aseg_distance.cpp b/attic/mris_aseg_distance/mris_aseg_distance.cpp
index 1ef50a817ab..9d2a6d99755 100644
--- a/attic/mris_aseg_distance/mris_aseg_distance.cpp
+++ b/attic/mris_aseg_distance/mris_aseg_distance.cpp
@@ -72,8 +72,7 @@ main(int argc, char *argv[]) {
 	int         vno, l ;
 	VERTEX      *v ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_aseg_distance.c,v 1.4 2011/03/02 00:04:26 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_aseg_distance");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_average_parcellation/mris_average_parcellation.cpp b/attic/mris_average_parcellation/mris_average_parcellation.cpp
index 69543da1c02..f512c1cccb2 100644
--- a/attic/mris_average_parcellation/mris_average_parcellation.cpp
+++ b/attic/mris_average_parcellation/mris_average_parcellation.cpp
@@ -61,11 +61,7 @@ main(int argc, char *argv[]) {
   counts=NULL;
   nvertices=0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_average_parcellation.c,v 1.4 2011/03/02 00:04:27 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_average_parcellation");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_classify_thickness/mris_classify_thickness.cpp b/attic/mris_classify_thickness/mris_classify_thickness.cpp
index d2054ed8d76..4f63249de01 100644
--- a/attic/mris_classify_thickness/mris_classify_thickness.cpp
+++ b/attic/mris_classify_thickness/mris_classify_thickness.cpp
@@ -191,8 +191,7 @@ main(int argc, char *argv[]) {
   RANDOM_FOREST *rf ;
   double       **training_data ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_classify_thickness.c,v 1.9 2012/03/08 13:30:17 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_classify_thickness");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
@@ -494,7 +493,6 @@ main(int argc, char *argv[]) {
   float        *test_thickness, *test_avg_thickness ;
   double       label_avg ;
 
-  /* rkt: check for and handle version tag */
   nargs = handle_version_option (argc, argv, "$Id: mris_classify_thickness.c,v 1.9 2012/03/08 13:30:17 fischl Exp $", "$Name:  $");
   if (nargs && argc - nargs == 1)
     exit (0);
diff --git a/attic/mris_compute_optimal_kernel/mris_compute_optimal_kernel.cpp b/attic/mris_compute_optimal_kernel/mris_compute_optimal_kernel.cpp
index ba4f7d83ed6..40020222279 100644
--- a/attic/mris_compute_optimal_kernel/mris_compute_optimal_kernel.cpp
+++ b/attic/mris_compute_optimal_kernel/mris_compute_optimal_kernel.cpp
@@ -72,8 +72,7 @@ main(int argc, char *argv[]) {
   LABEL         *subject_label, *group_label ;
   double        sigma ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_compute_optimal_kernel.c,v 1.6 2011/03/02 00:04:30 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_compute_optimal_kernel");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_curvature_vectors/mris_curvature_vectors.c b/attic/mris_curvature_vectors/mris_curvature_vectors.c
index 3d152fa9ce6..f40939d2bf7 100644
--- a/attic/mris_curvature_vectors/mris_curvature_vectors.c
+++ b/attic/mris_curvature_vectors/mris_curvature_vectors.c
@@ -82,9 +82,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE   *mris ;
 
   InitDebugging( "mris_curvature_vectors" ) ;
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv,
-                                 "$Id: mris_curvature_vectors.c,v 1.1 2011/11/20 01:17:34 jonp Exp $", "$Name:  $") ;
+  nargs = handleVersionOption(argc, argv, "mris_curvature_vectors");
 
   //Progname = argv[0] ;
   sprintf(Progname, "mris_curvature_vectors") ;
diff --git a/attic/mris_density/mris_density.cpp b/attic/mris_density/mris_density.cpp
index eebabffa860..92d16b5beab 100644
--- a/attic/mris_density/mris_density.cpp
+++ b/attic/mris_density/mris_density.cpp
@@ -66,8 +66,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE   *mris ;
   MRI           *mri_density ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_density.c,v 1.7 2011/03/02 00:04:31 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_density");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_fbirn_annot/mris_fbirn_annot.cpp b/attic/mris_fbirn_annot/mris_fbirn_annot.cpp
index 429dafb5965..d27ed59bc2e 100644
--- a/attic/mris_fbirn_annot/mris_fbirn_annot.cpp
+++ b/attic/mris_fbirn_annot/mris_fbirn_annot.cpp
@@ -103,7 +103,7 @@ char *subject, *hemi, *SUBJECTS_DIR;
 int main(int argc, char *argv[]) {
   int nargs;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_fbirn_annot");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/attic/mris_glm/mris_glm.cpp b/attic/mris_glm/mris_glm.cpp
index c185ddef622..f6cb27244c7 100644
--- a/attic/mris_glm/mris_glm.cpp
+++ b/attic/mris_glm/mris_glm.cpp
@@ -218,9 +218,7 @@ int main(int argc, char **argv) {
   char *inputfname;
   int  nargs,n;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv,
-                                 "$Id: mris_glm.c,v 1.55 2011/05/05 15:28:03 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_glm");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_longitudinal_surfaces/mris_longitudinal_surfaces.cpp b/attic/mris_longitudinal_surfaces/mris_longitudinal_surfaces.cpp
index 7255e2d4f46..fed2883e98e 100644
--- a/attic/mris_longitudinal_surfaces/mris_longitudinal_surfaces.cpp
+++ b/attic/mris_longitudinal_surfaces/mris_longitudinal_surfaces.cpp
@@ -187,12 +187,10 @@ main(int argc, char *argv[])
   Timer then ;
   M3D           *m3d ;
 
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string (argc, argv, "$Id: mris_longitudinal_surfaces.c,v 1.8 2015/11/09 04:18:29 zkaufman Exp $", "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mris_longitudinal_surfaces");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_longitudinal_surfaces.c,v 1.8 2015/11/09 04:18:29 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_longitudinal_surfaces");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/attic/mris_make_map_surfaces/mris_make_map_surfaces.cpp b/attic/mris_make_map_surfaces/mris_make_map_surfaces.cpp
index 087129f857c..9e9a91d99d0 100644
--- a/attic/mris_make_map_surfaces/mris_make_map_surfaces.cpp
+++ b/attic/mris_make_map_surfaces/mris_make_map_surfaces.cpp
@@ -72,18 +72,7 @@ main(int argc, char *argv[])
   int            ac, nargs, averages, i ;
   double         orig_dt ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_make_map_surfaces.c,v 1.3 2013/01/08 22:01:16 nicks Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mris_make_map_surfaces.c,v 1.3 2013/01/08 22:01:16 nicks Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_make_map_surfaces");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/attic/mris_ms_surface_CNR/mris_ms_surface_CNR.cpp b/attic/mris_ms_surface_CNR/mris_ms_surface_CNR.cpp
index 29b9d766cbc..814d2d8737e 100644
--- a/attic/mris_ms_surface_CNR/mris_ms_surface_CNR.cpp
+++ b/attic/mris_ms_surface_CNR/mris_ms_surface_CNR.cpp
@@ -114,8 +114,7 @@ main(int argc, char *argv[]) {
   MATRIX *SW1, *SW2, *SW, *InvSW;
   float *weight, weight_norm;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_ms_surface_CNR.c,v 1.4 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_ms_surface_CNR");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_surface_change/mris_surface_change.cpp b/attic/mris_surface_change/mris_surface_change.cpp
index 6814fade3b3..0c54919fe16 100644
--- a/attic/mris_surface_change/mris_surface_change.cpp
+++ b/attic/mris_surface_change/mris_surface_change.cpp
@@ -91,7 +91,7 @@ int main(int argc, char *argv[]) {
   char *out_fname ;
   MRI_SURFACE *mris1, *mris2 ;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_surface_change");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/attic/mris_svm_classify/mris_svm_classify.cpp b/attic/mris_svm_classify/mris_svm_classify.cpp
index db9d9ae8e00..f31ae588dce 100644
--- a/attic/mris_svm_classify/mris_svm_classify.cpp
+++ b/attic/mris_svm_classify/mris_svm_classify.cpp
@@ -73,8 +73,7 @@ main(int argc, char *argv[]) {
   float        *inputs ;
   MRI_SP       *mrisp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_svm_classify.c,v 1.6 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_svm_classify");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_svm_train/mris_svm_train.cpp b/attic/mris_svm_train/mris_svm_train.cpp
index 88e414a59b1..5cfd112a4f7 100644
--- a/attic/mris_svm_train/mris_svm_train.cpp
+++ b/attic/mris_svm_train/mris_svm_train.cpp
@@ -221,8 +221,7 @@ main(int argc, char *argv[]) {
 #endif
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_svm_train.c,v 1.6 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_svm_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_twoclass/mris_twoclass.cpp b/attic/mris_twoclass/mris_twoclass.cpp
index 9465e27633a..f60e484025f 100644
--- a/attic/mris_twoclass/mris_twoclass.cpp
+++ b/attic/mris_twoclass/mris_twoclass.cpp
@@ -254,8 +254,7 @@ main(int argc, char *argv[]) {
   if (write_flag && DIAG_VERBOSE_ON)
     fp = fopen("scalespace.dat", "w") ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_twoclass.c,v 1.13 2015/02/05 23:34:41 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_twoclass");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/mris_w_to_curv/mris_w_to_curv.cpp b/attic/mris_w_to_curv/mris_w_to_curv.cpp
index f13ef95ea26..2ebbce64ea4 100644
--- a/attic/mris_w_to_curv/mris_w_to_curv.cpp
+++ b/attic/mris_w_to_curv/mris_w_to_curv.cpp
@@ -63,8 +63,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE        *mris ;
   VERTEX             *v ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_w_to_curv.c,v 1.6 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_w_to_curv");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/oct_train/oct_rf_train.cpp b/attic/oct_train/oct_rf_train.cpp
index b3c44688c0a..4d0efb5e388 100644
--- a/attic/oct_train/oct_rf_train.cpp
+++ b/attic/oct_train/oct_rf_train.cpp
@@ -110,8 +110,7 @@ main(int argc, char *argv[]) {
   int            *training_classes ;
   int xi, yi, xk, yk, fno ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: oct_rf_train.c,v 1.1 2014/09/26 15:27:08 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "oct_rf_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/oct_train/oct_train.cpp b/attic/oct_train/oct_train.cpp
index 21c4d4266a2..1eec39fb26b 100644
--- a/attic/oct_train/oct_train.cpp
+++ b/attic/oct_train/oct_train.cpp
@@ -91,8 +91,7 @@ main(int argc, char *argv[]) {
   CDBN      *cdbn ;
   float     min_label, max_label ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: oct_train.c,v 1.1 2014/04/17 13:30:03 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "oct_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/rbftest/rbftest.cpp b/attic/rbftest/rbftest.cpp
index 16215440aad..725593adf00 100644
--- a/attic/rbftest/rbftest.cpp
+++ b/attic/rbftest/rbftest.cpp
@@ -75,8 +75,7 @@ main(int argc, char *argv[]) {
   /*  CLUSTER_SET  *cs ;*/
   RBF          *rbf ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: rbftest.c,v 1.7 2011/03/02 00:04:35 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "rbftest");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/repair_siemens_file/repair_siemens_file.cpp b/attic/repair_siemens_file/repair_siemens_file.cpp
index 0ff3dbc1584..ca30b23582b 100644
--- a/attic/repair_siemens_file/repair_siemens_file.cpp
+++ b/attic/repair_siemens_file/repair_siemens_file.cpp
@@ -52,11 +52,7 @@ int main(int argc, char *argv[]) {
   int i;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: repair_siemens_file.c,v 1.11 2011/03/02 00:04:35 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "repair_siemens_file");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/attic/spherical_stats/spherical_stats.cpp b/attic/spherical_stats/spherical_stats.cpp
index 8ebc0f4255c..86473b4dec0 100644
--- a/attic/spherical_stats/spherical_stats.cpp
+++ b/attic/spherical_stats/spherical_stats.cpp
@@ -532,8 +532,7 @@ int main(int argc, char *argv[]) {
   // int          msec, minutes, seconds ;
   // Timer start;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: spherical_stats.c,v 1.8 2011/03/02 00:04:40 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "spherical_stats");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/dngtester/cpptester.cpp b/dngtester/cpptester.cpp
index 3a20cf2babe..79ccb450c50 100644
--- a/dngtester/cpptester.cpp
+++ b/dngtester/cpptester.cpp
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
   cout << vcid << endl << endl;
 
   // Default initialization
-  int nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+  int nargs = handleVersionOption(argc, argv, "cpptester");
   if (nargs && argc - nargs == 1)
   {
     exit(0);
diff --git a/fem_elastic/exportGcam.cpp b/fem_elastic/exportGcam.cpp
index 037b54d68cd..a369ff5b14e 100644
--- a/fem_elastic/exportGcam.cpp
+++ b/fem_elastic/exportGcam.cpp
@@ -46,7 +46,7 @@ struct IoParams
   unsigned int zlibBuffer;
   int doTest;
 
-  void parse(int ac, const char** av);
+  void parse(int ac, char** av);
 };
 
 char* getChar(const std::string& str)
@@ -68,7 +68,7 @@ void initOctree2( gmp::VolumeMorph& morph)
 }
 
 int
-main(int ac, const char** av)
+main(int ac, char** av)
 {
   Timer timer;
 
@@ -184,7 +184,7 @@ main(int ac, const char** av)
 //---------------------------
 
 void
-IoParams::parse(int ac, const char** av)
+IoParams::parse(int ac, char** av)
 {
   ArgumentParser parser;
   // required
diff --git a/fem_elastic/fapplyMorph.cpp b/fem_elastic/fapplyMorph.cpp
index 4909845e8e8..ceeeef6d95d 100644
--- a/fem_elastic/fapplyMorph.cpp
+++ b/fem_elastic/fapplyMorph.cpp
@@ -137,13 +137,13 @@ struct IoParams
 
   unsigned int zlibBuffer;
 
-  void parse(int ac, const char** av);
+  void parse(int ac, char** av);
 };
 
 //------------------------------------------------------
 
 int
-main(int argc, const char** argv)
+main(int argc, char** argv)
 {
   // cmd-line
   IoParams params;
@@ -295,7 +295,7 @@ main(int argc, const char** argv)
 //---------------------
 
 void
-IoParams::parse(int ac, const char** av)
+IoParams::parse(int ac, char** av)
 {
   ArgumentParser parser;
   // required
diff --git a/fem_elastic/fcreateMorph.cpp b/fem_elastic/fcreateMorph.cpp
index 4c1fa7dd356..deefafb98f4 100644
--- a/fem_elastic/fcreateMorph.cpp
+++ b/fem_elastic/fcreateMorph.cpp
@@ -47,7 +47,7 @@ struct IoParams
   typedef std::vector<int> IntVectorType;
   IntVectorType vDbgCoords;
 
-  void parse(int ac, const char** av);
+  void parse(int ac, char** av);
 };
 
 //==================================================
@@ -58,7 +58,7 @@ MRI*
 CopyGcamToDeltaField(GCA_MORPH* gcam, MRI* field);
 
 int
-main(int argc, const char** argv)
+main(int argc, char** argv)
 {
   IoParams params;
   try
@@ -241,7 +241,7 @@ main(int argc, const char** argv)
 
 
 void
-IoParams::parse(int ac, const char** av)
+IoParams::parse(int ac, char** av)
 {
   ArgumentParser parser;
   // required
diff --git a/histo_compute_joint_density/histo_compute_joint_density.cpp b/histo_compute_joint_density/histo_compute_joint_density.cpp
index 314d1eaf33a..5284191f809 100644
--- a/histo_compute_joint_density/histo_compute_joint_density.cpp
+++ b/histo_compute_joint_density/histo_compute_joint_density.cpp
@@ -78,8 +78,7 @@ main(int argc, char *argv[]) {
   char fname[STRLEN] ;
   MRI         *mri1_pyramid[MAX_LEVELS], *mri2_pyramid[MAX_LEVELS];
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: histo_compute_joint_density.c,v 1.4 2011/03/02 00:04:09 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "histo_compute_joint_density");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/histo_register_block/histo_register_block.cpp b/histo_register_block/histo_register_block.cpp
index 1d39ee10d2d..055de430f15 100644
--- a/histo_register_block/histo_register_block.cpp
+++ b/histo_register_block/histo_register_block.cpp
@@ -135,8 +135,7 @@ main(int argc, char *argv[]) {
   MRI_SEGMENTATION *mriseg ;
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: histo_register_block.c,v 1.9 2011/03/02 00:04:09 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "histo_register_block");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/histo_synthesize/histo_synthesize.cpp b/histo_synthesize/histo_synthesize.cpp
index 09721743c2a..16072ab0772 100644
--- a/histo_synthesize/histo_synthesize.cpp
+++ b/histo_synthesize/histo_synthesize.cpp
@@ -105,8 +105,7 @@ main(int argc, char *argv[]) {
 
   setRandomSeed(-1L) ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: histo_synthesize.c,v 1.5 2012/10/30 14:02:08 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "histo_synthesize");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/include/argparse.h b/include/argparse.h
index 43a08ce227e..16ea78b7828 100644
--- a/include/argparse.h
+++ b/include/argparse.h
@@ -195,15 +195,18 @@ class ArgumentParser {
   
   // ----------------------------- argument parser ----------------------------
 
-  ArgumentParser() : variable_positional(false), variable_flag(false) {}
+  ArgumentParser() : variable_positional(false), variable_flag(false) {
+    // add default --all-info and --version flags
+    addArgument("--all-info", 0, Bool, false);
+    addArgument("--version", 0, Bool, false);
+  }
 
   void addArgument(const String& name, char nargs = 0, ArgType argtype = Unknown, bool required = false);
   void addArgument(const String& short_name, const String& name, char nargs = 0, ArgType argtype = Unknown, bool required = false);
 
   void addHelp(const unsigned char *text, unsigned int size);
 
-  void parse(size_t argc, const char** argv);
-  void parse(const StringVector& argv);
+  void parse(size_t argc, char** argv);
 
   bool exists(const String& name);
 
diff --git a/include/mri.h b/include/mri.h
index d3e451471d4..1d155763b65 100644
--- a/include/mri.h
+++ b/include/mri.h
@@ -1503,7 +1503,7 @@ MRI *MRIconformSliceOrder(MRI *mri);
     Please use MRIextractDistanceMap in fastmarching.h instead */
 MRI *MRIdistanceTransform(MRI *mri_src, MRI *mri_dist,
                           int label, float max_dist, int mode, MRI *mri_mask);
-int MRIaddCommandLine(MRI *mri, char *cmdline) ;
+int MRIaddCommandLine(MRI *mri, const std::string& cmdline);
 MRI *MRInonMaxSuppress(MRI *mri_src, MRI *mri_sup,
                        float thresh, int thresh_dir) ;
 MRI *MRIextractRegionAndPad(MRI *mri_src, MRI *mri_dst,
diff --git a/include/mrisurf.h b/include/mrisurf.h
index efe00301d6a..13a40b20464 100644
--- a/include/mrisurf.h
+++ b/include/mrisurf.h
@@ -1606,7 +1606,7 @@ int MRISsurf2surf(MRIS *mris, MRI *dst, LTA *lta);
 // convert all vertex positions
 int MRISsurf2surfAll(MRIS *mris, MRI *dst, LTA *lta);
 void MRISsetReadFrame(int frame);
-int MRISaddCommandLine(MRI_SURFACE *mris, char *cmdline) ;
+int MRISaddCommandLine(MRI_SURFACE *mris, const std::string& cmdline);
 int MRISgetReadFrame(void);
 int MRISabsCurvature(MRI_SURFACE *mris) ;
 int MRISabsVals(MRI_SURFACE *mris) ;
diff --git a/include/version.h b/include/version.h
index e887a4db8b2..8b88d832564 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,75 +1,15 @@
-/**
- * @file  version.h
- * @brief freesurfer version functions defined here
- *
- * Looks for the --version, -version, --all-info, or -all-info tag in the 
- * argv and if found, prints out version information, namely this:
- * ProgramVersion, TimeStamp, CVS, User, Machine, Platform, PlatformVersion
- * CompilerName, and CompilerVersion.
- */
-/*
- * Original Author: Kevin Teich
- * Revision Info:
- *    $Author: nicks $
- *    $Date: 2011/03/02 00:04:10 $
- *    $Id$
- *
- * Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
- *
- * Terms and conditions for use, reproduction, distribution and contribution
- * are found in the 'FreeSurfer Software License Agreement' contained
- * in the file 'LICENSE' found in the FreeSurfer distribution, and here:
- *
- * https://surfer.nmr.mgh.harvard.edu/fswiki/FreeSurferSoftwareLicense
- *
- * Reporting: freesurfer@nmr.mgh.harvard.edu
- *
- */
+#pragma once
 
+#include <string>
 
-#ifndef VERSION_H
-#define VERSION_H
 
-/* This function looks for the --version, or -version tag in the
-   argv and if found, prints out version information. This can be used
-   in any binary. It will return the number of options processed and
-   copy the remaining items in argv back, so the caller can shorten
-   their own argc variable, like this:
+std::string getVersion();
+std::string getBuildStamp();
+std::string getAllInfo(int argc, char **argv, const std::string& progname);
 
-    nargs = handle_version_option (argc, argv,
-                                   "dollarIDdollar", "dollarNamedollar");
-    argc -= nargs ;
+int handleVersionOption(int argc, char** argv, const char* progname);
 
-   (This is done so that it can easily be used with older programs
-   that make assumptions about argument counts instead of scanning for
-   options.)
-
-   It will print out the id string passed in, which should just be
-   dollar sign + ID + dollar sign, which CVS will expand to include
-   the CVS information including CVS file, revision number, date,
-   peson who checked it in, and tag, as well as the OS and GCC
-   information.
-
-   The binary may also want to exit if there are no other options to
-   handle, i.e.
-
-    nargs = handle_version_option (argc, argv,
-                                   "dollarIDdollar", "dollarNamedollar");
-    if (nargs && argc - nargs == 1)
-      exit (0);
-    argc -= nargs;
-
-   This will also handle the --all-info option which prints out
-   more information in the format necessary for the BIRN provenance
-   spec, including the version_string.
-
-*/
-
-int handle_version_option(int argc, char** argv, const char* id_string, const char* version_string);
-int make_cmd_version_string(int argc, char** argv,  const char* id_string, const char* version_string, char *return_string);
 char *argv2cmdline(int argc, char *argv[]);
 char *VERuser(void);
 char *VERfileTimeStamp(char *fname);
 char *VERcurTimeStamp(void);
-
-#endif
diff --git a/label2flat/label2flat.cpp b/label2flat/label2flat.cpp
index 17a700fadf6..9985aa8cace 100644
--- a/label2flat/label2flat.cpp
+++ b/label2flat/label2flat.cpp
@@ -101,8 +101,7 @@ main(int argc, char *argv[]) {
   LABEL        *area ;
   MRI_SURFACE  *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: label2flat.c,v 1.9 2016/12/11 15:13:53 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "label2flat");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/label2patch/label2patch.cpp b/label2patch/label2patch.cpp
index 46f9affc9da..3692d4c0c0b 100644
--- a/label2patch/label2patch.cpp
+++ b/label2patch/label2patch.cpp
@@ -66,8 +66,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   LABEL        *label ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: label2patch.c,v 1.7 2016/12/10 22:57:39 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "label2patch");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/lta_convert/lta_convert.cpp b/lta_convert/lta_convert.cpp
index 93f99393602..c6d2d444377 100644
--- a/lta_convert/lta_convert.cpp
+++ b/lta_convert/lta_convert.cpp
@@ -630,7 +630,7 @@ int main(int argc, char *argv[])
   cout << vcid << endl << endl;
 
   // Default initialization
-  int nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+  int nargs = handleVersionOption(argc, argv, "lta_convert");
   if (nargs && argc - nargs == 1)
   {
     exit(0);
diff --git a/mkxsubjreg/mkxsubjreg.cpp b/mkxsubjreg/mkxsubjreg.cpp
index 94ce8d348f2..dae3da9c2fc 100644
--- a/mkxsubjreg/mkxsubjreg.cpp
+++ b/mkxsubjreg/mkxsubjreg.cpp
@@ -170,8 +170,7 @@ static int parse_commandline(int argc, char **argv) {
 
   if (argc < 1) usage_exit();
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mkxsubjreg.c,v 1.5 2011/03/02 00:04:13 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mkxsubjreg");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_add_xform_to_header/mri_add_xform_to_header.cpp b/mri_add_xform_to_header/mri_add_xform_to_header.cpp
index bf970556f46..cefdf36f7e6 100644
--- a/mri_add_xform_to_header/mri_add_xform_to_header.cpp
+++ b/mri_add_xform_to_header/mri_add_xform_to_header.cpp
@@ -56,11 +56,7 @@ main(int argc, char *argv[])
   MRI    *mri=NULL ;
   char   *xform_fname=NULL, *in_fname=NULL, *out_fname=NULL ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_add_xform_to_header.c,v 1.12 2011/03/02 00:04:13 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_add_xform_to_header");
 
   argc -= nargs;
 
diff --git a/mri_and/mri_and.cpp b/mri_and/mri_and.cpp
index bbb3dacac9f..90f355c620b 100644
--- a/mri_and/mri_and.cpp
+++ b/mri_and/mri_and.cpp
@@ -57,8 +57,7 @@ int main(int argc, char *argv[])
   char **av ;
   MRI  *mri_and = NULL, *mri ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_and");
   if (nargs && argc - nargs == 1)
     exit (0);
   Progname = argv[0] ;
diff --git a/mri_and/mri_or.cpp b/mri_and/mri_or.cpp
index bcdc08cbddd..79b1972807c 100644
--- a/mri_and/mri_or.cpp
+++ b/mri_and/mri_or.cpp
@@ -57,8 +57,7 @@ int main(int argc, char *argv[])
   char **av ;
   MRI  *mri_or = NULL, *mri ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_or");
   if (nargs && argc - nargs == 1)
     exit (0);
   Progname = argv[0] ;
diff --git a/mri_annotation2label/mri_annotation2label.cpp b/mri_annotation2label/mri_annotation2label.cpp
index 10820688fe1..6e074b9db2e 100644
--- a/mri_annotation2label/mri_annotation2label.cpp
+++ b/mri_annotation2label/mri_annotation2label.cpp
@@ -107,8 +107,7 @@ int main(int argc, char **argv)
   int nargs,IsBorder,k;
   MRI *border;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_annotation2label.c,v 1.32 2016/08/02 21:20:27 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_annotation2label");
   if (nargs && argc - nargs == 1) {
     exit (0);
   }
diff --git a/mri_aparc2aseg/mri_aparc2aseg.cpp b/mri_aparc2aseg/mri_aparc2aseg.cpp
index 2415e4770c0..1a7e115ff79 100644
--- a/mri_aparc2aseg/mri_aparc2aseg.cpp
+++ b/mri_aparc2aseg/mri_aparc2aseg.cpp
@@ -140,8 +140,7 @@ int main(int argc, char **argv)
   TRANSFORM *xform  = NULL;
   GCA *gca = NULL ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_aparc2aseg");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_aparc2wmseg/mri_aparc2wmseg.cpp b/mri_aparc2wmseg/mri_aparc2wmseg.cpp
index 93baa3237fc..83d42227145 100644
--- a/mri_aparc2wmseg/mri_aparc2wmseg.cpp
+++ b/mri_aparc2wmseg/mri_aparc2wmseg.cpp
@@ -88,8 +88,7 @@ int main(int argc, char **argv) {
   struct utsname uts;
   char *cmdline, cwd[2000];
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_aparc2wmseg");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_average/mri_average.cpp b/mri_average/mri_average.cpp
index 25ef4829465..1256d0074b9 100644
--- a/mri_average/mri_average.cpp
+++ b/mri_average/mri_average.cpp
@@ -182,11 +182,7 @@ main(int argc, char *argv[])
   int          msec, minutes, seconds, skipped = 0 ;
   Timer start ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_average.c,v 1.47 2016/06/01 17:49:55 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_average");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_bias/mri_apply_bias.cpp b/mri_bias/mri_apply_bias.cpp
index a172f23e1e7..832fcd17c94 100644
--- a/mri_bias/mri_apply_bias.cpp
+++ b/mri_bias/mri_apply_bias.cpp
@@ -57,11 +57,7 @@ main(int argc, char *argv[]) {
   int          msec, minutes, seconds ;
   Timer start ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_apply_bias.c,v 1.5 2011/03/02 00:04:13 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_apply_bias");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_bias/mri_compute_bias.cpp b/mri_bias/mri_compute_bias.cpp
index 782ab4f4281..1f2aae864eb 100644
--- a/mri_bias/mri_compute_bias.cpp
+++ b/mri_bias/mri_compute_bias.cpp
@@ -71,11 +71,7 @@ main(int argc, char *argv[])
 	double       c_r, c_a, c_s ;
   MATRIX       *m_vox2vox ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_compute_bias.c,v 1.7 2011/10/06 01:19:35 fischl Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_bias");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_binarize/mri_binarize.cpp b/mri_binarize/mri_binarize.cpp
index 99ff6ab8f0e..5b229a65cd9 100644
--- a/mri_binarize/mri_binarize.cpp
+++ b/mri_binarize/mri_binarize.cpp
@@ -272,7 +272,7 @@ int main(int argc, char *argv[]) {
   FILE *fp;
   MRI *mritmp;
 
-  nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_binarize");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_brainvol_stats/mri_brainvol_stats.cpp b/mri_brainvol_stats/mri_brainvol_stats.cpp
index 5a17356bdf5..fa29a6ff506 100644
--- a/mri_brainvol_stats/mri_brainvol_stats.cpp
+++ b/mri_brainvol_stats/mri_brainvol_stats.cpp
@@ -10,7 +10,7 @@
 #include "cma.h"
 
 
-int main(int argc, const char **argv) 
+int main(int argc, char **argv) 
 {
   // parse arguments
   ArgumentParser parser;
diff --git a/mri_ca_label/mri_ca_label.cpp b/mri_ca_label/mri_ca_label.cpp
index f2e28e4985f..62e50587ed8 100644
--- a/mri_ca_label/mri_ca_label.cpp
+++ b/mri_ca_label/mri_ca_label.cpp
@@ -255,19 +255,11 @@ int main(int argc, char *argv[])
   GCA          *gca ;
   TRANSFORM     *transform ;
 
-  char cmdline[CMD_LINE_LEN] ;
 
   FSinit() ;
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_ca_label.c,v 1.115 2016/10/22 17:31:36 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_ca_label.c,v 1.115 2016/10/22 17:31:36 fischl Exp $",
-           "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mri_ca_label");
+
+  nargs = handleVersionOption(argc, argv, "mri_ca_label");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_ca_normalize/mri_ca_normalize.cpp b/mri_ca_normalize/mri_ca_normalize.cpp
index 0320f84456e..63b4a8010ab 100644
--- a/mri_ca_normalize/mri_ca_normalize.cpp
+++ b/mri_ca_normalize/mri_ca_normalize.cpp
@@ -163,19 +163,12 @@ main(int argc, char *argv[])
   Timer start ;
   GCA_SAMPLE   *gcas, *gcas_norm = NULL, *gcas_struct ;
   TRANSFORM    *transform = NULL ;
-  char         cmdline[CMD_LINE_LEN] ;
-
-  FSinit() ;
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_ca_normalize.c,v 1.69 2016/10/22 17:30:57 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_ca_normalize.c,v 1.69 2016/10/22 17:30:57 fischl Exp $",
-           "$Name:  $");
+
+  FSinit();
+  
+  std::string cmdline = getAllInfo(argc, argv, "mri_ca_normalize");
+
+  nargs = handleVersionOption(argc, argv, "mri_ca_normalize");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_ca_normalize/mri_cal_normalize.cpp b/mri_ca_normalize/mri_cal_normalize.cpp
index 5d82efc74ec..86408d4f9f7 100644
--- a/mri_ca_normalize/mri_cal_normalize.cpp
+++ b/mri_ca_normalize/mri_cal_normalize.cpp
@@ -140,19 +140,12 @@ main(int argc, char *argv[])
   Timer start ;
   GCA_SAMPLE   *gcas, *gcas_norm = NULL, *gcas_struct ;
   TRANSFORM    *transform = NULL ;
-  char         cmdline[CMD_LINE_LEN], line[STRLEN], *cp, sdir[STRLEN], base_name[STRLEN] ;
+  char         line[STRLEN], *cp, sdir[STRLEN], base_name[STRLEN] ;
   FILE         *fp ;
 
-  make_cmd_version_string
-    (argc, argv,
-     "$Id: mri_cal_normalize.c,v 1.11 2015/10/02 17:12:53 mreuter Exp $",
-     "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_cal_normalize");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mri_cal_normalize.c,v 1.11 2015/10/02 17:12:53 mreuter Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_cal_normalize");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_ca_register/mri_ca_register.cpp b/mri_ca_register/mri_ca_register.cpp
index 308a07cfa5d..d54adb94018 100644
--- a/mri_ca_register/mri_ca_register.cpp
+++ b/mri_ca_register/mri_ca_register.cpp
@@ -235,10 +235,7 @@ main(int argc, char *argv[])
   DiagInit(NULL, NULL, NULL) ;
   ErrorInit(NULL, NULL, NULL) ;
 
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_ca_register.c,v 1.99 2016/10/22 17:31:24 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ca_register");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_ca_tissue_parms/mri_ca_tissue_parms.cpp b/mri_ca_tissue_parms/mri_ca_tissue_parms.cpp
index 7d4cc0c5877..8d38ff1f9ca 100644
--- a/mri_ca_tissue_parms/mri_ca_tissue_parms.cpp
+++ b/mri_ca_tissue_parms/mri_ca_tissue_parms.cpp
@@ -71,8 +71,7 @@ main(int argc, char *argv[]) {
   MRI          *mri_parc, *mri_T1, *mri_PD ;
   FILE         *fp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_ca_tissue_parms.c,v 1.8 2011/03/02 00:04:14 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ca_tissue_parms");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_ca_train/mri_ca_train.cpp b/mri_ca_train/mri_ca_train.cpp
index e1a29b3d031..3cb375a1e10 100644
--- a/mri_ca_train/mri_ca_train.cpp
+++ b/mri_ca_train/mri_ca_train.cpp
@@ -153,11 +153,7 @@ main(int argc, char *argv[])
   parms.node_spacing = 4.0f ;
   parms.prior_spacing = 2.0f ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_ca_train.c,v 1.70 2015/07/27 20:52:08 greve Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ca_train");
 
   if (nargs && argc - nargs == 1)
     exit (0);
diff --git a/mri_cal_renormalize_gca/mri_cal_renormalize_gca.cpp b/mri_cal_renormalize_gca/mri_cal_renormalize_gca.cpp
index 82fa461e982..ca3ca89a0a1 100644
--- a/mri_cal_renormalize_gca/mri_cal_renormalize_gca.cpp
+++ b/mri_cal_renormalize_gca/mri_cal_renormalize_gca.cpp
@@ -77,19 +77,12 @@ main(int argc, char *argv[])
   int          input, ninputs ;
   Timer start ;
   TRANSFORM    *transform ;
-  char         cmdline[CMD_LINE_LEN], line[STRLEN], *cp, sdir[STRLEN], base_name[STRLEN] ;
+  char         line[STRLEN], *cp, sdir[STRLEN], base_name[STRLEN] ;
   FILE         *fp ;
 
-  make_cmd_version_string
-    (argc, argv,
-     "$Id: mri_cal_renormalize_gca.c,v 1.2 2015/10/02 17:16:23 mreuter Exp $",
-     "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_cal_renormalize_gca");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mri_cal_renormalize_gca.c,v 1.2 2015/10/02 17:16:23 mreuter Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_cal_renormalize_gca");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_cc/mri_cc.cpp b/mri_cc/mri_cc.cpp
index 05aa15a5689..d5f804bc4ce 100644
--- a/mri_cc/mri_cc.cpp
+++ b/mri_cc/mri_cc.cpp
@@ -176,17 +176,7 @@ main(int argc, char *argv[])
               ez_x, ez_y, ez_z, zf, zf_low=256, zf_high=0;
   MATRIX      *m_evectors ;
 
-  char cmdline[CMD_LINE_LEN] ;
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_cc.c,v 1.39 2015/12/04 13:59:56 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_cc.c,v 1.39 2015/12/04 13:59:56 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_cc");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_cnr/mri_cnr.cpp b/mri_cnr/mri_cnr.cpp
index d67432a0318..a13e3967957 100644
--- a/mri_cnr/mri_cnr.cpp
+++ b/mri_cnr/mri_cnr.cpp
@@ -70,8 +70,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE *mris ;
   double      cnr_total, cnr = 0.0 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_cnr.c,v 1.11 2016/05/05 18:44:03 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_cnr");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_compile_edits/mri_compile_edits.cpp b/mri_compile_edits/mri_compile_edits.cpp
index 5355bca6ce0..0f1d790c5cb 100644
--- a/mri_compile_edits/mri_compile_edits.cpp
+++ b/mri_compile_edits/mri_compile_edits.cpp
@@ -73,11 +73,7 @@ main(int argc, char *argv[])
   // default output file name:
   out_fname = strcpyalloc("edits.mgz");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mri_compile_edits.c,v 1.8 2012/02/08 20:33:17 nicks Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compile_edits");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_compute_change_map/mri_compute_change_map.cpp b/mri_compute_change_map/mri_compute_change_map.cpp
index 67ae242bf5d..d40e8d2b81f 100644
--- a/mri_compute_change_map/mri_compute_change_map.cpp
+++ b/mri_compute_change_map/mri_compute_change_map.cpp
@@ -78,8 +78,7 @@ main(int argc, char *argv[]) {
   TRANSFORM     *transform ;
   float         std ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_compute_change_map.c,v 1.7 2015/02/05 23:34:40 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_change_map");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_compute_overlap/mri_compute_overlap.cpp b/mri_compute_overlap/mri_compute_overlap.cpp
index 04b583ec760..75563c822f7 100644
--- a/mri_compute_overlap/mri_compute_overlap.cpp
+++ b/mri_compute_overlap/mri_compute_overlap.cpp
@@ -78,11 +78,7 @@ main(int argc, char *argv[]) {
   float  nvox_mean, nunion, total_nunion ;
   float tmp = 0.0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_compute_overlap.c,v 1.19 2015/10/20 20:07:19 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_overlap");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_compute_seg_overlap/mri_compute_seg_overlap.cpp b/mri_compute_seg_overlap/mri_compute_seg_overlap.cpp
index b69e8a07cee..6430c051c64 100644
--- a/mri_compute_seg_overlap/mri_compute_seg_overlap.cpp
+++ b/mri_compute_seg_overlap/mri_compute_seg_overlap.cpp
@@ -142,11 +142,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs =
-    handle_version_option
-    (argc, argv,
-     "$Id: mri_compute_seg_overlap.c,v 1.18 2015/08/28 18:05:30 greve Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_seg_overlap");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_compute_volume_fractions/mri_compute_layer_fractions.cpp b/mri_compute_volume_fractions/mri_compute_layer_fractions.cpp
index c60db416c99..726a91807e7 100644
--- a/mri_compute_volume_fractions/mri_compute_layer_fractions.cpp
+++ b/mri_compute_volume_fractions/mri_compute_layer_fractions.cpp
@@ -91,8 +91,7 @@ main(int argc, char *argv[])
   MATRIX      *m_regdat ;
   float       intensity, betplaneres, inplaneres ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_compute_layer_fractions.c,v 1.4 2012/04/11 17:52:45 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_layer_fractions");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_compute_volume_fractions/mri_compute_volume_fractions.cpp b/mri_compute_volume_fractions/mri_compute_volume_fractions.cpp
index d99d355ad6f..5d5774270e1 100644
--- a/mri_compute_volume_fractions/mri_compute_volume_fractions.cpp
+++ b/mri_compute_volume_fractions/mri_compute_volume_fractions.cpp
@@ -92,7 +92,7 @@ int main(int argc, char *argv[]) {
   MRIS *lhw, *lhp, *rhw, *rhp;
   Timer start ;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_volume_fractions");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_compute_volume_fractions/mri_compute_volume_intensities.cpp b/mri_compute_volume_fractions/mri_compute_volume_intensities.cpp
index 3cbeeffb07b..b80c591910d 100644
--- a/mri_compute_volume_fractions/mri_compute_volume_intensities.cpp
+++ b/mri_compute_volume_fractions/mri_compute_volume_intensities.cpp
@@ -90,8 +90,7 @@ main(int argc, char *argv[])
   char        fname[STRLEN], *stem ;
   MRI         *mri_src, *mri_vfrac_wm, *mri_vfrac_cortex, *mri_vfrac_subcort, *mri_vfrac_csf, *mri_unpv_intensities ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_compute_volume_intensities.c,v 1.3 2016/04/19 13:32:50 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_volume_intensities");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_compute_volume_fractions/mris_compute_layer_intensities.cpp b/mri_compute_volume_fractions/mris_compute_layer_intensities.cpp
index 1a8424093bd..6b4585844af 100644
--- a/mri_compute_volume_fractions/mris_compute_layer_intensities.cpp
+++ b/mri_compute_volume_fractions/mris_compute_layer_intensities.cpp
@@ -85,8 +85,7 @@ main(int argc, char *argv[])
   char        fname[STRLEN] ;
   MRI         *mri_intensities, *mri_volume_fractions, *mri_layer_intensities ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_compute_layer_intensities.c,v 1.9 2016/04/19 13:31:39 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_compute_layer_intensities");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_concat/mri_concat.cpp b/mri_concat/mri_concat.cpp
index 4cba6c786ce..c19a6474312 100644
--- a/mri_concat/mri_concat.cpp
+++ b/mri_concat/mri_concat.cpp
@@ -145,8 +145,7 @@ int main(int argc, char **argv)
   MRI *Vpca=NULL;
   char *stem;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_concat");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_concatenate_lta/mri_concatenate_lta.cpp b/mri_concatenate_lta/mri_concatenate_lta.cpp
index 92651446e07..db7817e26aa 100644
--- a/mri_concatenate_lta/mri_concatenate_lta.cpp
+++ b/mri_concatenate_lta/mri_concatenate_lta.cpp
@@ -78,10 +78,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_concatenate_lta.c,v 1.16 2015/11/21 00:06:20 greve Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_concatenate_lta");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_convert/mri_convert.cpp b/mri_convert/mri_convert.cpp
index 4ca7e037ce8..6a7d641552d 100644
--- a/mri_convert/mri_convert.cpp
+++ b/mri_convert/mri_convert.cpp
@@ -196,7 +196,6 @@ int main(int argc, char *argv[])
   int nthframe=-1;
   int reduce = 0 ;
   float fwhm, gstd;
-  char cmdline[STRLEN] ;
   int sphinx_flag = FALSE;
   int LeftRightReverse = FALSE;
   int LeftRightReversePix = FALSE;
@@ -220,11 +219,7 @@ int main(int argc, char *argv[])
   ErrorInit(NULL, NULL, NULL) ;
   DiagInit(NULL, NULL, NULL) ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_convert.c,v 1.227 2017/02/16 19:15:42 greve Exp $",
-   "$Name:  $",
-   cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_convert");
 
   for(i=0; i<argc; i++)
   {
@@ -343,14 +338,7 @@ int main(int argc, char *argv[])
   STAT_TABLE *StatTable=NULL;
   STAT_TABLE *OutStatTable=NULL;
 
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (
-      argc, argv,
-      "$Id: mri_convert.c,v 1.227 2017/02/16 19:15:42 greve Exp $",
-      "$Name:  $"
-    );
+  nargs = handleVersionOption(argc, argv, "mri_convert");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_convert/mri_make_uchar.cpp b/mri_convert/mri_make_uchar.cpp
index df7a340f33c..f74a49b6825 100644
--- a/mri_convert/mri_make_uchar.cpp
+++ b/mri_convert/mri_make_uchar.cpp
@@ -62,11 +62,7 @@ main(int argc, char *argv[])
   MRI       *mri_in, *mri_out ;
   LTA *tal_xform ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (
-            argc, argv,
-            "$Id: mri_make_uchar.c,v 1.4 2011/03/02 00:04:14 nicks Exp $",
-            "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_make_uchar");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_copy_values/mri_copy_values.cpp b/mri_copy_values/mri_copy_values.cpp
index fdef6d35077..9cf3d9d9666 100644
--- a/mri_copy_values/mri_copy_values.cpp
+++ b/mri_copy_values/mri_copy_values.cpp
@@ -49,8 +49,7 @@ main(int argc, char *argv[]) {
   char   *in_fname, *out_fname ;
   int    label, nvox ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_copy_values.c,v 1.5 2011/03/02 00:04:14 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_copy_values");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_cor2label/mri_cor2label.cpp b/mri_cor2label/mri_cor2label.cpp
index 1f185bd8dcc..e9e1f92f952 100644
--- a/mri_cor2label/mri_cor2label.cpp
+++ b/mri_cor2label/mri_cor2label.cpp
@@ -165,8 +165,7 @@ int main(int argc, char **argv) {
   MATRIX *vox2rastkr=NULL, *crs=NULL, *xyz=NULL;
   double voxval;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_cor2label.c,v 1.12 2011/03/02 00:04:14 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_cor2label");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_coreg/mri_coreg.cpp b/mri_coreg/mri_coreg.cpp
index d472743ce88..08d39b43113 100644
--- a/mri_coreg/mri_coreg.cpp
+++ b/mri_coreg/mri_coreg.cpp
@@ -223,7 +223,7 @@ int main(int argc, char *argv[]) {
   cmdargs->optschema = 1;
   cmdargs->rusagefile = "";
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_coreg");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_correct_segmentations/mri_correct_segmentations.cpp b/mri_correct_segmentations/mri_correct_segmentations.cpp
index b19e40dc750..2023aff3bbe 100644
--- a/mri_correct_segmentations/mri_correct_segmentations.cpp
+++ b/mri_correct_segmentations/mri_correct_segmentations.cpp
@@ -47,8 +47,7 @@ int main(int argc, char *argv[])
   char **av ;
   MRI  *outmri0 = NULL, *outmri1 = NULL, *outmri2 = NULL, *outmri3 = NULL, *outmri4 = NULL, *segmri ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_correct_segmentations");
   if (nargs && argc - nargs == 1)
     exit (0);
   Progname = argv[0] ;
diff --git a/mri_deface/mri_deface.cpp b/mri_deface/mri_deface.cpp
index 373adaa6725..cd1892f04ad 100644
--- a/mri_deface/mri_deface.cpp
+++ b/mri_deface/mri_deface.cpp
@@ -275,9 +275,7 @@ main(int argc, char *argv[]) {
   DiagInit(NULL, NULL, NULL) ;
   ErrorInit(NULL, NULL, NULL) ;
 
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_deface.c,v 1.25 2014/07/18 02:11:40 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_deface");
   argc -= nargs ;
   if (1 == argc)
     ErrorExit
diff --git a/mri_diff/mri_diff.cpp b/mri_diff/mri_diff.cpp
index f0c20e82e64..b449c141c9f 100644
--- a/mri_diff/mri_diff.cpp
+++ b/mri_diff/mri_diff.cpp
@@ -218,7 +218,7 @@ int main(int argc, char *argv[]) {
   double AvgDiff=0.0,SumDiff=0.0,SumSqDiff=0.0;
   FILE *fp=NULL;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_diff");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_dist_surf_label/mri_dist_surf_label.cpp b/mri_dist_surf_label/mri_dist_surf_label.cpp
index 920aed2b54c..9b1dc7e35c0 100644
--- a/mri_dist_surf_label/mri_dist_surf_label.cpp
+++ b/mri_dist_surf_label/mri_dist_surf_label.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[]) {
   int ac, nargs;
   char   **av;
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_label_vals.c,v 1.16 2015/08/24 18:22:05 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_dist_surf_label");
     if (nargs && argc - nargs == 1)
       exit (0);
     argc -= nargs;
diff --git a/mri_edit_segmentation/mri_edit_segmentation.cpp b/mri_edit_segmentation/mri_edit_segmentation.cpp
index d22569b7da5..65cdfe1c48b 100644
--- a/mri_edit_segmentation/mri_edit_segmentation.cpp
+++ b/mri_edit_segmentation/mri_edit_segmentation.cpp
@@ -83,8 +83,7 @@ main(int argc, char *argv[]) {
   int          msec, minutes, seconds ;
   Timer start ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_edit_segmentation.c,v 1.11 2011/03/02 00:04:15 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_edit_segmentation");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_edit_wm_with_aseg/mri_edit_wm_with_aseg.cpp b/mri_edit_wm_with_aseg/mri_edit_wm_with_aseg.cpp
index 23addf8e4f4..fc6b9309d1d 100644
--- a/mri_edit_wm_with_aseg/mri_edit_wm_with_aseg.cpp
+++ b/mri_edit_wm_with_aseg/mri_edit_wm_with_aseg.cpp
@@ -94,12 +94,11 @@ main(int argc, char *argv[])
   MRI    *mri_wm, *mri_aseg, *mri_T1 ;
   Timer then ;
   int    msec, nargs ;
-  char cmdline[CMD_LINE_LEN], *output_file_name,*input_file_name, *edits_file_name ;
+  char *output_file_name,*input_file_name, *edits_file_name ;
 
-  make_cmd_version_string (argc, argv, "$Id: mri_edit_wm_with_aseg.c,v 1.25 2012/03/29 13:17:38 fischl Exp $", "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_edit_wm_with_aseg");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_edit_wm_with_aseg.c,v 1.25 2012/03/29 13:17:38 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_edit_wm_with_aseg");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_em_register/mri_em_register.cpp b/mri_em_register/mri_em_register.cpp
index bf9ebb999f0..e3a2752908b 100644
--- a/mri_em_register/mri_em_register.cpp
+++ b/mri_em_register/mri_em_register.cpp
@@ -250,12 +250,7 @@ main(int argc, char *argv[])
 
   FSinit() ;
 
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (argc, argv,
-     "$Id: mri_em_register.c,v 1.106 2016/10/22 17:31:12 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_em_register");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_evaluate_morph/mri_evaluate_morph.cpp b/mri_evaluate_morph/mri_evaluate_morph.cpp
index 82691faf495..2a694b5f284 100644
--- a/mri_evaluate_morph/mri_evaluate_morph.cpp
+++ b/mri_evaluate_morph/mri_evaluate_morph.cpp
@@ -66,8 +66,7 @@ main(int argc, char *argv[]) {
   TRANSFORM    *transform1, *transform2 ;
   FILE         *fp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_evaluate_morph.c,v 1.5 2011/03/02 00:04:15 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_evaluate_morph");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_extract/mri_extract.cpp b/mri_extract/mri_extract.cpp
index 787a5d68c6d..3fd8462e204 100644
--- a/mri_extract/mri_extract.cpp
+++ b/mri_extract/mri_extract.cpp
@@ -53,8 +53,7 @@ main(int argc, char *argv[]) {
   char   *in_dir, *out_dir ;
   MRI_REGION box ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_extract.c,v 1.8 2016/06/08 13:42:17 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_extract");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_extract_fcd_features/mri_extract_fcd_features.cpp b/mri_extract_fcd_features/mri_extract_fcd_features.cpp
index aedb92aea17..f5e4995ae5b 100644
--- a/mri_extract_fcd_features/mri_extract_fcd_features.cpp
+++ b/mri_extract_fcd_features/mri_extract_fcd_features.cpp
@@ -84,8 +84,7 @@ main(int argc, char *argv[])
   MRI_SURFACE  *mris, *mris_contra ;
   LABEL        *cortex ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_extract_fcd_features.c,v 1.1 2016/06/15 17:51:09 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_extract_fcd_features");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_extract_label/mri_extract_label.cpp b/mri_extract_label/mri_extract_label.cpp
index c140d146ef5..32e62f008f9 100644
--- a/mri_extract_label/mri_extract_label.cpp
+++ b/mri_extract_label/mri_extract_label.cpp
@@ -74,11 +74,7 @@ main(int argc, char *argv[])
   int         ac, nargs, i, label ;
   MRI         *mri_in, *mri_out, *mri_kernel, *mri_smoothed ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_extract_label.c,v 1.13 2011/03/02 00:04:15 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_extract_label");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_extract_largest_CC/mri_extract_largest_CC.cpp b/mri_extract_largest_CC/mri_extract_largest_CC.cpp
index 40b6eb6bccd..bcec2401256 100644
--- a/mri_extract_largest_CC/mri_extract_largest_CC.cpp
+++ b/mri_extract_largest_CC/mri_extract_largest_CC.cpp
@@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_extract_largest_CC.c,v 1.9 2012/06/25 18:34:05 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_extract_largest_CC");
   argc -= nargs ;
   if (1 >= argc)
     usage (0);
diff --git a/mri_fdr/mri_fdr.cpp b/mri_fdr/mri_fdr.cpp
index 4fd592ecf12..346daae9ebd 100644
--- a/mri_fdr/mri_fdr.cpp
+++ b/mri_fdr/mri_fdr.cpp
@@ -131,7 +131,7 @@ int main(int argc, char *argv[]) {
   cmdargs->log10flag = 1;
   cmdargs->signid = 0;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fdr");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_fieldsign/mri_fieldsign.cpp b/mri_fieldsign/mri_fieldsign.cpp
index b41cb94d22a..4901f6a2332 100644
--- a/mri_fieldsign/mri_fieldsign.cpp
+++ b/mri_fieldsign/mri_fieldsign.cpp
@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
   MRI *eccensfa, *polarsfa, *mri, *mritmp;
   MRI *eccenreal,*eccenimag,*polarreal,*polarimag;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fieldsign");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_fill/mri_fill.cpp b/mri_fill/mri_fill.cpp
index 3675e5119b9..b5710428635 100644
--- a/mri_fill/mri_fill.cpp
+++ b/mri_fill/mri_fill.cpp
@@ -2019,20 +2019,12 @@ main(int argc, char *argv[])
   MATRIX *m_L;
   VOL_GEOM *dst=0;
   VOL_GEOM *src=0;
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_fill.c,v 1.119 2011/10/25 14:09:58 fischl Exp $", "$Name:  $",
-   cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_fill");
 
   // Gdiag = 0xFFFFFFFF;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_fill.c,v 1.119 2011/10/25 14:09:58 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fill");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_fit_bias/mri_fit_bias.cpp b/mri_fit_bias/mri_fit_bias.cpp
index 9908dc7ecdb..3fd8f74192f 100644
--- a/mri_fit_bias/mri_fit_bias.cpp
+++ b/mri_fit_bias/mri_fit_bias.cpp
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
   nctxsegs = sizeof(ctxsegs)/sizeof(int);
   nexsegs = sizeof(exsegs)/sizeof(int);
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fit_bias");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_fslmat_to_lta/mri_fslmat_to_lta.cpp b/mri_fslmat_to_lta/mri_fslmat_to_lta.cpp
index 6e7993b5e8f..7a70e859ae2 100644
--- a/mri_fslmat_to_lta/mri_fslmat_to_lta.cpp
+++ b/mri_fslmat_to_lta/mri_fslmat_to_lta.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *argv[]) {
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_fslmat_to_lta.c,v 1.3 2011/03/02 00:04:15 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fslmat_to_lta");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs ;
diff --git a/mri_fuse_intensity_images/mri_fuse_intensity_images.cpp b/mri_fuse_intensity_images/mri_fuse_intensity_images.cpp
index 065ed85ff05..5b00dee5454 100644
--- a/mri_fuse_intensity_images/mri_fuse_intensity_images.cpp
+++ b/mri_fuse_intensity_images/mri_fuse_intensity_images.cpp
@@ -81,19 +81,12 @@ main(int argc, char *argv[])
   int          input, ninputs ;
   Timer start ;
   TRANSFORM    *transform = NULL ;
-  char         cmdline[CMD_LINE_LEN], line[STRLEN], *cp, subject[STRLEN], sdir[STRLEN], base_name[STRLEN] ;
+  char         line[STRLEN], *cp, subject[STRLEN], sdir[STRLEN], base_name[STRLEN] ;
   FILE         *fp ;
 
-  make_cmd_version_string
-    (argc, argv,
-     "$Id: mri_fuse_intensity_images.c,v 1.2 2011/06/02 14:05:10 fischl Exp $",
-     "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_fuse_intensity_images");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mri_fuse_intensity_images.c,v 1.2 2011/06/02 14:05:10 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fuse_intensity_images");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_fuse_segmentations/mri_fuse_segmentations.cpp b/mri_fuse_segmentations/mri_fuse_segmentations.cpp
index bba85cf0cd8..74e78dec659 100644
--- a/mri_fuse_segmentations/mri_fuse_segmentations.cpp
+++ b/mri_fuse_segmentations/mri_fuse_segmentations.cpp
@@ -72,10 +72,7 @@ static void printUsage(void);
 
 int main(int argc, char *argv[])
 {
-  /* rkt: check for and handle version tag */
-  int nargs = handle_version_option(argc, argv,
-    "$Id: mri_fuse_segmentations.cpp,v 1.8 2011/03/02 00:04:15 nicks Exp $",
-    "$Name:  $");
+  int nargs = handleVersionOption(argc, argv, "mri_fuse_segmentations");
   if (nargs && argc - nargs == 1) exit(EXIT_SUCCESS);
   argc -= nargs;
   
diff --git a/mri_fwhm/mri_fwhm.cpp b/mri_fwhm/mri_fwhm.cpp
index 3b21ceace82..4e3c816b521 100644
--- a/mri_fwhm/mri_fwhm.cpp
+++ b/mri_fwhm/mri_fwhm.cpp
@@ -343,7 +343,7 @@ int main(int argc, char *argv[]) {
   sprintf(tmpstr, "S%sER%sRONT%sOR", "URF", "_F", "DO") ;
   setenv(tmpstr,"1",0);
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fwhm");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_gca_ambiguous/mri_gca_ambiguous.cpp b/mri_gca_ambiguous/mri_gca_ambiguous.cpp
index 033ac5e2032..ec8c7447eae 100644
--- a/mri_gca_ambiguous/mri_gca_ambiguous.cpp
+++ b/mri_gca_ambiguous/mri_gca_ambiguous.cpp
@@ -87,8 +87,7 @@ main(int argc, char *argv[]) {
   double       TEs[MAX_FAS],  TRs[MAX_FAS],  FAs[MAX_FAS], amb ;
   GCA          *gca_flash ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_gca_ambiguous.c,v 1.4 2011/03/02 00:04:15 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_gca_ambiguous");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_gcut/mri_gcut.cpp b/mri_gcut/mri_gcut.cpp
index b0bb0f5df04..892c9f09a21 100644
--- a/mri_gcut/mri_gcut.cpp
+++ b/mri_gcut/mri_gcut.cpp
@@ -240,10 +240,7 @@ static int parse_commandline(int argc, char **argv)
 int main(int argc, char *argv[])
 {
   /* check for and handle version tag */
-  int nargs = handle_version_option
-              (argc, argv,
-               "$Id: mri_gcut.cpp,v 1.14 2011/03/02 00:04:16 nicks Exp $",
-               "$Name:  $");
+  int nargs = handleVersionOption(argc, argv, "mri_gcut");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_glmfit/mri_glmfit.cpp b/mri_glmfit/mri_glmfit.cpp
index e9f8d5d49a1..22b0456b01a 100644
--- a/mri_glmfit/mri_glmfit.cpp
+++ b/mri_glmfit/mri_glmfit.cpp
@@ -774,8 +774,7 @@ int main(int argc, char **argv) {
   csd = CSDalloc();
   csd->threshsign = 0; //0=abs,+1,-1
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_glmfit");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_gtmpvc/mri_gtmpvc.cpp b/mri_gtmpvc/mri_gtmpvc.cpp
index ceefcb38ad0..5922e5034b0 100644
--- a/mri_gtmpvc/mri_gtmpvc.cpp
+++ b/mri_gtmpvc/mri_gtmpvc.cpp
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
   char *stem;
   LTA *ltatmp;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_gtmpvc");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_gtmseg/mri_gtmseg.cpp b/mri_gtmseg/mri_gtmseg.cpp
index ca303bc835c..4066593c844 100644
--- a/mri_gtmseg/mri_gtmseg.cpp
+++ b/mri_gtmseg/mri_gtmseg.cpp
@@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
   MRI *mritmp;
   LTA *seg2new, *ltatmp;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_gtmseg");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_hausdorff_dist/mri_hausdorff_dist.cpp b/mri_hausdorff_dist/mri_hausdorff_dist.cpp
index 142718a4561..518c3f8cfe5 100644
--- a/mri_hausdorff_dist/mri_hausdorff_dist.cpp
+++ b/mri_hausdorff_dist/mri_hausdorff_dist.cpp
@@ -80,8 +80,7 @@ int main(int argc, char *argv[])
   double hdist, hdists[MAX_VOLUMES] ;
   FILE   *fp  ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_hausdorff_dist");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_head/mri_head.cpp b/mri_head/mri_head.cpp
index 39fc0523cf4..8babf4967fd 100644
--- a/mri_head/mri_head.cpp
+++ b/mri_head/mri_head.cpp
@@ -62,8 +62,7 @@ static int action = ACTION_NONE;
 int main(int argc, char *argv[]) {
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_head.c,v 1.7 2011/03/02 00:04:16 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_head");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_histo_eq/mri_histo_eq.cpp b/mri_histo_eq/mri_histo_eq.cpp
index 91053136e31..7a0dc9f3a80 100644
--- a/mri_histo_eq/mri_histo_eq.cpp
+++ b/mri_histo_eq/mri_histo_eq.cpp
@@ -59,8 +59,7 @@ main(int argc, char *argv[]) {
   Timer start ;
   MRI    *mri_src, *mri_template ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_histo_eq.c,v 1.6 2011/03/02 00:04:18 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_histo_eq");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_info/mri_info.cpp b/mri_info/mri_info.cpp
index 12e051f10ff..14743443ab6 100644
--- a/mri_info/mri_info.cpp
+++ b/mri_info/mri_info.cpp
@@ -123,8 +123,7 @@ int main(int argc, char *argv[])
 {
   int nargs, index;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_info");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_jacobian/mri_jacobian.cpp b/mri_jacobian/mri_jacobian.cpp
index 9fdd4001f52..5d60fe0b087 100644
--- a/mri_jacobian/mri_jacobian.cpp
+++ b/mri_jacobian/mri_jacobian.cpp
@@ -70,8 +70,7 @@ main(int argc, char *argv[])
   Timer start ;
   MRI       *mri, *mri_jacobian, *mri_area, *mri_orig_area ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_jacobian.c,v 1.11 2011/12/10 22:47:57 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_jacobian");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_joint_density/mri_joint_density.cpp b/mri_joint_density/mri_joint_density.cpp
index 1fcee947ca0..946dd9d97fe 100644
--- a/mri_joint_density/mri_joint_density.cpp
+++ b/mri_joint_density/mri_joint_density.cpp
@@ -62,8 +62,7 @@ main(int argc, char *argv[]) {
   float        fmin1, fmax1, fmin2, fmax2 ;
   double       val1, val2 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_joint_density.c,v 1.6 2011/03/02 00:04:20 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_joint_density");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_label2label/mri_label2label.cpp b/mri_label2label/mri_label2label.cpp
index 68a33781181..ff517a14d1a 100644
--- a/mri_label2label/mri_label2label.cpp
+++ b/mri_label2label/mri_label2label.cpp
@@ -197,11 +197,7 @@ int main(int argc, char **argv) {
   PATH** paths;
   PATH* path;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv,
-     "$Id: mri_label2label.c,v 1.50 2016/12/10 22:57:43 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_label2label");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_label2vol/mri_label2vol.cpp b/mri_label2vol/mri_label2vol.cpp
index ba2eb6de4fc..88e356c0a55 100644
--- a/mri_label2vol/mri_label2vol.cpp
+++ b/mri_label2vol/mri_label2vol.cpp
@@ -159,14 +159,10 @@ int main(int argc, char **argv) {
   MRI *ribbon;
   char tmpstr[2000];
   LABEL **labels;
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string (argc, argv,
-                           "$Id: mri_label2vol.c,v 1.46 2014/12/08 21:11:54 greve Exp $", "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_label2vol");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv,
-                                 "$Id: mri_label2vol.c,v 1.46 2014/12/08 21:11:54 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_label2vol");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_label_histo/mri_label_histo.cpp b/mri_label_histo/mri_label_histo.cpp
index c8645b2887c..7016adbb5a6 100644
--- a/mri_label_histo/mri_label_histo.cpp
+++ b/mri_label_histo/mri_label_histo.cpp
@@ -60,8 +60,7 @@ main(int argc, char *argv[]) {
   FILE   *log_fp ;
   HISTOGRAM *histo ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_label_histo.c,v 1.5 2011/03/02 00:04:22 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_label_histo");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_label_vals/mri_label_vals.cpp b/mri_label_vals/mri_label_vals.cpp
index 39bdaf720f6..fc3fff323e1 100644
--- a/mri_label_vals/mri_label_vals.cpp
+++ b/mri_label_vals/mri_label_vals.cpp
@@ -68,8 +68,7 @@ main(int argc, char *argv[]) {
   MRI    *mri,  *mri_seg ;
   double xw, yw, zw, xv, yv, zv, val;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_label_vals.c,v 1.16 2015/08/24 18:22:05 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_label_vals");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_label_volume/mri_label_volume.cpp b/mri_label_volume/mri_label_volume.cpp
index 10a1736dc21..de2c370e8f5 100644
--- a/mri_label_volume/mri_label_volume.cpp
+++ b/mri_label_volume/mri_label_volume.cpp
@@ -73,12 +73,7 @@ main(int argc, char *argv[]) {
   FILE   *log_fp ;
   double  vox_volume, brain_volume ;
 
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (argc, argv,
-     "$Id: mri_label_volume.c,v 1.31 2011/03/02 00:04:22 nicks Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_label_volume");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_linear_register/mri_linear_register.cpp b/mri_linear_register/mri_linear_register.cpp
index f310db5ef22..cd6b433d999 100644
--- a/mri_linear_register/mri_linear_register.cpp
+++ b/mri_linear_register/mri_linear_register.cpp
@@ -110,8 +110,7 @@ main(int argc, char *argv[]) {
   Timer start ;
   MATRIX       *m_L ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_linear_register.c,v 1.13 2011/03/02 00:04:22 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_linear_register");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_log_likelihood/mri_log_likelihood.cpp b/mri_log_likelihood/mri_log_likelihood.cpp
index a784759fa7c..15a5119111d 100644
--- a/mri_log_likelihood/mri_log_likelihood.cpp
+++ b/mri_log_likelihood/mri_log_likelihood.cpp
@@ -78,19 +78,11 @@ main(int argc, char *argv[]) {
   GCA          *gca ;
   int          ac, nargs, input, ninputs ;
   TRANSFORM    *transform = NULL ;
-  char         cmdline[CMD_LINE_LEN] ;
   double       ll ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_log_likelihood.c,v 1.4 2011/03/02 00:04:22 nicks Exp $",
-   "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_log_likelihood");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_log_likelihood.c,v 1.4 2011/03/02 00:04:22 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_log_likelihood");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_map_cpdat/mri_map_cpdat.cpp b/mri_map_cpdat/mri_map_cpdat.cpp
index 09667d5b5d7..2e547691801 100644
--- a/mri_map_cpdat/mri_map_cpdat.cpp
+++ b/mri_map_cpdat/mri_map_cpdat.cpp
@@ -49,8 +49,6 @@ static struct Parameters P =
 static int get_option(int argc, char *argv[], Parameters & P) ;
 static void  usage_exit(int code) ;
 
-static char vcid[] =
-  "$Id: mri_map_cpdat.cpp,v 1.6 2014/01/21 23:07:41 greve Exp $";
 const char *Progname = NULL;
 static LTA *LTAloadTalairachXFM(const char *subject);
 static LTA *LTAloadTalairachXFMInv(const char *subject);
@@ -61,7 +59,7 @@ int main(int argc, char *argv[])
   LTA* lta=NULL;
 
   // Default initialization
-  nargs = handle_version_option(argc, argv,vcid,"$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_map_cpdat");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_mark_temporal_lobe/mri_mark_temporal_lobe.cpp b/mri_mark_temporal_lobe/mri_mark_temporal_lobe.cpp
index 5066be0f8c7..fa3b57df414 100644
--- a/mri_mark_temporal_lobe/mri_mark_temporal_lobe.cpp
+++ b/mri_mark_temporal_lobe/mri_mark_temporal_lobe.cpp
@@ -60,8 +60,7 @@ main(int argc, char *argv[]) {
   Timer start ;
   MRI          *mri_seg, *mri_dst ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_mark_temporal_lobe.c,v 1.5 2011/03/02 00:04:23 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_mark_temporal_lobe");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_mask/mri_mask.cpp b/mri_mask/mri_mask.cpp
index 2e192b8da47..6e9b184c1f6 100644
--- a/mri_mask/mri_mask.cpp
+++ b/mri_mask/mri_mask.cpp
@@ -89,12 +89,7 @@ int main(int argc, char *argv[])
   float value;
   MRI_REGION *region;
 
-  nargs =
-    handle_version_option
-    (
-      argc, argv,
-      "$Id: mri_mask.c,v 1.24 2016/11/28 20:30:57 fischl Exp $", "$Name:  $"
-    );
+  nargs = handleVersionOption(argc, argv, "mri_mask");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_matrix_multiply/mri_matrix_multiply.cpp b/mri_matrix_multiply/mri_matrix_multiply.cpp
index 15a310ae409..a4eac9c317e 100644
--- a/mri_matrix_multiply/mri_matrix_multiply.cpp
+++ b/mri_matrix_multiply/mri_matrix_multiply.cpp
@@ -82,8 +82,7 @@ int main(int argc, char *argv[]) {
   int nargs;
   double v;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_matrix_multiply.c,v 1.13 2011/03/02 00:04:23 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_matrix_multiply");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_mc/mri_mc.cpp b/mri_mc/mri_mc.cpp
index 261883c66d8..882a5b405cd 100644
--- a/mri_mc/mri_mc.cpp
+++ b/mri_mc/mri_mc.cpp
@@ -800,12 +800,9 @@ int main(int argc, char *argv[]) {
   MRIS **mris_table, *mris,*mris_corrected;
   MRI *mri;
 
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string 
-    (argc, argv, 
-     "$Id: mri_mc.c,v 1.23 2014/03/22 01:40:02 greve Exp $", "$Name:  $", 
-     cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_mc");
+
   Progname=argv[0];
 
   if (argc > 1 && (stricmp(argv[1], "-d") == 0)) {
diff --git a/mri_mc/mri_pretess.cpp b/mri_mc/mri_pretess.cpp
index 3fba08300e8..8901ad57ac2 100644
--- a/mri_mc/mri_pretess.cpp
+++ b/mri_mc/mri_pretess.cpp
@@ -1057,24 +1057,16 @@ int main(int argc, char *argv[])
   MRI *mri_seg,*mri_orig, *mri_seg_orig, *mri_old = NULL;
   int niter=100,ntotal=0,nmodified,i,j,k,nvoxels, ac ;
   int label, nargs,nvox;
-  char cmdline[CMD_LINE_LEN], **av ;
+  char **av ;
   int x, y, z ,convert=0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_pretess.c,v 1.22 2013/08/30 18:12:25 mreuter Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_pretess");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
   }
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_pretess.c,v 1.22 2013/08/30 18:12:25 mreuter Exp $",
-   "$Name:  $",
-   cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_pretess");
 
   Progname=argv[0];
 
diff --git a/mri_mcsim/mri_mcsim.cpp b/mri_mcsim/mri_mcsim.cpp
index bb8df2cfad2..d6602c3a1c6 100644
--- a/mri_mcsim/mri_mcsim.cpp
+++ b/mri_mcsim/mri_mcsim.cpp
@@ -182,7 +182,7 @@ int main(int argc, char *argv[]) {
   FILE *fp, *fpLog=NULL;
   float **ppVal, **ppSig, **ppVal0, **ppSig0, **ppZ, **ppZ0;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_mcsim");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_mi/mri_mi.cpp b/mri_mi/mri_mi.cpp
index ef5195c632b..0099d1540ae 100644
--- a/mri_mi/mri_mi.cpp
+++ b/mri_mi/mri_mi.cpp
@@ -63,8 +63,7 @@ int main(int argc, char *argv[])
 
   // printf("mri_mi 1\n") ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_mi");
   if (nargs && argc - nargs == 1)
     exit (0);
   Progname = argv[0] ;
diff --git a/mri_modify/mri_copy_params.cpp b/mri_modify/mri_copy_params.cpp
index b1087bdfba7..67ac01c163e 100644
--- a/mri_modify/mri_copy_params.cpp
+++ b/mri_modify/mri_copy_params.cpp
@@ -54,11 +54,7 @@ int main(int argc, char *argv[]) {
   bool bVolumeDifferent = false;
   bool bSizeDifferent = false;
   int  nargs;
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_copy_params.cpp,v 1.5 2011/03/02 00:04:23 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_copy_params");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_modify/mri_modify.cpp b/mri_modify/mri_modify.cpp
index aa8c9fd2a2b..80ab205e38c 100644
--- a/mri_modify/mri_modify.cpp
+++ b/mri_modify/mri_modify.cpp
@@ -122,11 +122,7 @@ int get_option(int argc, char *argv[], VOL_GEOM &vg) {
 
 int main(int argc, char *argv[]) {
   int nargs;
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_modify.cpp,v 1.10 2013/08/05 17:57:07 fischl Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_modify");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_morphology/mri_morphology.cpp b/mri_morphology/mri_morphology.cpp
index 95abc672d8e..2d82d955913 100644
--- a/mri_morphology/mri_morphology.cpp
+++ b/mri_morphology/mri_morphology.cpp
@@ -75,8 +75,7 @@ main(int argc, char *argv[]) {
   int          msec, minutes, seconds ;
   Timer start ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_morphology.c,v 1.15 2012/03/15 18:31:07 lzollei Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_morphology");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_ms_fitparms/mri_ms_fitparms.cpp b/mri_ms_fitparms/mri_ms_fitparms.cpp
index 93786599134..b5904eec575 100644
--- a/mri_ms_fitparms/mri_ms_fitparms.cpp
+++ b/mri_ms_fitparms/mri_ms_fitparms.cpp
@@ -226,21 +226,12 @@ main(int argc, char *argv[])
   MRI *mri_tmp = NULL;
   float thresh;
   int b, segno;
-  char cmdline[CMD_LINE_LEN] ;
 
   FA = TE = TR = 0;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_ms_fitparms.c,v 1.76 2016/11/30 21:46:55 fischl Exp $",
-   "$Name:  $",
-   cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (
-            argc, argv,
-            "$Id: mri_ms_fitparms.c,v 1.76 2016/11/30 21:46:55 fischl Exp $",
-            "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mri_ms_fitparms");
+
+  nargs = handleVersionOption(argc, argv, "mri_ms_fitparms");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_nlfilter/mri_nlfilter.cpp b/mri_nlfilter/mri_nlfilter.cpp
index b567fb6e6ea..d43da06548f 100644
--- a/mri_nlfilter/mri_nlfilter.cpp
+++ b/mri_nlfilter/mri_nlfilter.cpp
@@ -91,8 +91,7 @@ main(int argc, char *argv[]) {
   *mri_offset, *mri_up, *mri_polv, *mri_dir, *mri_clip, *mri_full ;
   MRI_REGION  region, clip_region ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_nlfilter.c,v 1.17 2016/12/08 17:27:53 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_nlfilter");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_normalize/mri_long_normalize.cpp b/mri_normalize/mri_long_normalize.cpp
index d94a500bd9a..d188934ab96 100644
--- a/mri_normalize/mri_long_normalize.cpp
+++ b/mri_normalize/mri_long_normalize.cpp
@@ -82,22 +82,12 @@ main(int argc, char *argv[])
 {
   char   *tp_fname, *in_fname, *out_fname, *tp_names[MAX_TPS] ;
   int    nargs, t, ntps ;
-  char cmdline[CMD_LINE_LEN], line[STRLEN], *cp, fname[STRLEN], bdir[STRLEN], *bname, sdir[STRLEN] ;
+  char line[STRLEN], *cp, fname[STRLEN], bdir[STRLEN], *bname, sdir[STRLEN] ;
   MRI   *mri_norm = NULL, *mri_aseg = NULL, *mri_ctrl, *mri_bias, *mri_dst, *mri_brain = NULL ;
   FILE  *fp ;
   LTA   *ltas[MAX_TPS] ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_long_normalize.c,v 1.1 2015/05/20 15:59:06 fischl Exp $",
-   "$Name:  $",
-   cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_long_normalize.c,v 1.1 2015/05/20 15:59:06 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_long_normalize");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_normalize/mri_normalize.cpp b/mri_normalize/mri_normalize.cpp
index 5eeb152c66d..7223ffd3c21 100644
--- a/mri_normalize/mri_normalize.cpp
+++ b/mri_normalize/mri_normalize.cpp
@@ -171,23 +171,10 @@ main(int argc, char *argv[])
   int          msec, minutes, seconds ;
   Timer start ;
 
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_normalize.c,v 1.92 2017/01/27 22:31:34 ah221 Exp $",
-   "$Name:  $",
-   cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_normalize.c,v 1.92 2017/01/27 22:31:34 ah221 Exp $",
-           "$Name:  $");
-  if (nargs && argc - nargs == 1)
-  {
-    exit (0);
-  }
+  std::string cmdline = getAllInfo(argc, argv, "mri_normalize");
+  nargs = handleVersionOption(argc, argv, "mri_normalize");
+  if (nargs && argc - nargs == 1) exit(0);
   argc -= nargs;
 
   Progname = argv[0] ;
diff --git a/mri_normalize_tp2/mri_normalize_tp2.cpp b/mri_normalize_tp2/mri_normalize_tp2.cpp
index 1bfb4ff5acf..e16238f71bd 100644
--- a/mri_normalize_tp2/mri_normalize_tp2.cpp
+++ b/mri_normalize_tp2/mri_normalize_tp2.cpp
@@ -92,10 +92,7 @@ int main(int argc, char *argv[]) {
 
   Progname = argv[0];
 
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_normalize_tp2.c,v 1.8 2011/03/02 00:04:23 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_normalize_tp2");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs ;
diff --git a/mri_paint/mri_paint.cpp b/mri_paint/mri_paint.cpp
index d8b8fb0493e..074a819f4e9 100644
--- a/mri_paint/mri_paint.cpp
+++ b/mri_paint/mri_paint.cpp
@@ -67,8 +67,7 @@ main(int argc, char *argv[]) {
   LTA         *lta ;
   MATRIX      *m ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_paint.c,v 1.5 2011/03/02 00:04:23 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_paint");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_parse_sdcmdir/mri_parse_sdcmdir.cpp b/mri_parse_sdcmdir/mri_parse_sdcmdir.cpp
index cfd86dddbe1..146d9550f29 100644
--- a/mri_parse_sdcmdir/mri_parse_sdcmdir.cpp
+++ b/mri_parse_sdcmdir/mri_parse_sdcmdir.cpp
@@ -247,8 +247,7 @@ static int parse_commandline(int argc, char **argv) {
   FILE *fptmp;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_parse_sdcmdir.c,v 1.22 2015/05/21 16:37:12 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_parse_sdcmdir");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_path2label/mri_path2label.cpp b/mri_path2label/mri_path2label.cpp
index 329027d8de6..7bea2f70a51 100644
--- a/mri_path2label/mri_path2label.cpp
+++ b/mri_path2label/mri_path2label.cpp
@@ -123,10 +123,7 @@ int main(int argc, char *argv[])
   int   err                  = 0;
   FILE* fp                   = NULL;
 
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_path2label.c,v 1.23 2011/03/02 00:04:23 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_path2label");
   if(nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
 
diff --git a/mri_polv/mri_polv.cpp b/mri_polv/mri_polv.cpp
index 3cc635d468d..002085c515c 100644
--- a/mri_polv/mri_polv.cpp
+++ b/mri_polv/mri_polv.cpp
@@ -55,8 +55,7 @@ main(int argc, char *argv[]) {
   MRI    *mri_src, *mri_dst = NULL ;
   char   *in_fname, *out_fname ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_polv.c,v 1.6 2011/03/02 00:04:24 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_polv");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_probe_ima/mri_probe_ima.cpp b/mri_probe_ima/mri_probe_ima.cpp
index 257ce76aedb..fe6b9a930e7 100644
--- a/mri_probe_ima/mri_probe_ima.cpp
+++ b/mri_probe_ima/mri_probe_ima.cpp
@@ -88,8 +88,7 @@ int main(int argc, char **argv) {
   IMAFILEINFO *ifi;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_probe_ima.c,v 1.13 2011/03/02 00:04:24 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_probe_ima");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_probedicom/mri_probedicom.cpp b/mri_probedicom/mri_probedicom.cpp
index 581cb7ffd0e..36d1a768986 100644
--- a/mri_probedicom/mri_probedicom.cpp
+++ b/mri_probedicom/mri_probedicom.cpp
@@ -155,8 +155,7 @@ int main(int argc, char **argv) {
   int n,nvoxs,err;
   double bval, xbvec, ybvec, zbvec;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_probedicom.c,v 1.45 2015/07/28 21:51:22 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_probedicom");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_rbvpvc/mri_rbvpvc.c b/mri_rbvpvc/mri_rbvpvc.c
index 420d487595d..41854510a5f 100644
--- a/mri_rbvpvc/mri_rbvpvc.c
+++ b/mri_rbvpvc/mri_rbvpvc.c
@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
   FILE *logfp,*fp;
   char *stem;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_rbvpvc");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_reduce/mri_reduce.cpp b/mri_reduce/mri_reduce.cpp
index ba7b231de28..f62b43a8aa1 100644
--- a/mri_reduce/mri_reduce.cpp
+++ b/mri_reduce/mri_reduce.cpp
@@ -49,8 +49,7 @@ main(int argc, char *argv[]) {
   MRI    *mri_src, *mri_dst = NULL ;
   char   *in_fname, *out_fname ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_reduce.c,v 1.9 2012/10/19 13:56:00 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_reduce");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_refine_seg/mri_refine_seg.cpp b/mri_refine_seg/mri_refine_seg.cpp
index d0d4cb96c43..ee0d68d8419 100644
--- a/mri_refine_seg/mri_refine_seg.cpp
+++ b/mri_refine_seg/mri_refine_seg.cpp
@@ -164,7 +164,7 @@ static bool voxelTouches(MRI *seg, intvec labels, int c, int r, int s)
 }
 
 
-int main(int argc, const char **argv) {
+int main(int argc, char **argv) {
 
   // ------ setup ------
 
diff --git a/mri_relabel_hypointensities/mri_relabel_hypointensities.cpp b/mri_relabel_hypointensities/mri_relabel_hypointensities.cpp
index 0502e9f1623..5b6c7be9d49 100644
--- a/mri_relabel_hypointensities/mri_relabel_hypointensities.cpp
+++ b/mri_relabel_hypointensities/mri_relabel_hypointensities.cpp
@@ -69,17 +69,7 @@ main(int argc, char *argv[])
   MRI_SURFACE   *mris ;
   MRI           *mri_aseg ;
 
-  char cmdline[CMD_LINE_LEN] ;
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_relabel_hypointensities.c,v 1.13 2015/05/15 18:44:10 nicks Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_relabel_hypointensities.c,v 1.13 2015/05/15 18:44:10 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_relabel_hypointensities");
   if (nargs && argc - nargs == 1) {
     exit (0);
   }
diff --git a/mri_relabel_nonwm_hypos/mri_relabel_nonwm_hypos.cpp b/mri_relabel_nonwm_hypos/mri_relabel_nonwm_hypos.cpp
index 29848c010d9..11289b91c84 100644
--- a/mri_relabel_nonwm_hypos/mri_relabel_nonwm_hypos.cpp
+++ b/mri_relabel_nonwm_hypos/mri_relabel_nonwm_hypos.cpp
@@ -93,7 +93,7 @@ int main(int argc, char *argv[]) {
   int nargs,err;
   MRI *seg, *newseg;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_relabel_nonwm_hypos");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_remove_neck/mri_remove_neck.cpp b/mri_remove_neck/mri_remove_neck.cpp
index 652b3456ab6..8685bffb3bf 100644
--- a/mri_remove_neck/mri_remove_neck.cpp
+++ b/mri_remove_neck/mri_remove_neck.cpp
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
   DiagInit(NULL, NULL, NULL) ;
   ErrorInit(NULL, NULL, NULL) ;
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_remove_neck.c,v 1.10 2011/03/02 00:04:24 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_remove_neck");
   argc -= nargs ;
   if (1 == argc)
   {
diff --git a/mri_rf_label/mri_rf_label.cpp b/mri_rf_label/mri_rf_label.cpp
index b011f728ca7..b05fcb0bf86 100644
--- a/mri_rf_label/mri_rf_label.cpp
+++ b/mri_rf_label/mri_rf_label.cpp
@@ -116,18 +116,10 @@ main(int argc, char *argv[])
   RFA          *rfa = NULL ;
   RANDOM_FOREST *rf = NULL ;  // if single_classifier_flag is true
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_rf_label.c,v 1.3 2012/05/23 23:50:50 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_rf_label.c,v 1.3 2012/05/23 23:50:50 fischl Exp $",
-           "$Name:  $");
+
+  std::string cmdline = getAllInfo(argc, argv, "mri_rf_label");
+
+  nargs = handleVersionOption(argc, argv, "mri_rf_label");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_rf_long_train/mri_rf_long_train.cpp b/mri_rf_long_train/mri_rf_long_train.cpp
index dd68d55cc40..02007eaaf5c 100644
--- a/mri_rf_long_train/mri_rf_long_train.cpp
+++ b/mri_rf_long_train/mri_rf_long_train.cpp
@@ -155,11 +155,7 @@ main(int argc, char *argv[])
   parms.training_fraction = .5 ;
   parms.feature_fraction = 1 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_rf_long_train.c,v 1.5 2012/06/15 12:22:28 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_rf_long_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_rf_train/mri_rf_train.cpp b/mri_rf_train/mri_rf_train.cpp
index 3853df5959a..003d80be94a 100644
--- a/mri_rf_train/mri_rf_train.cpp
+++ b/mri_rf_train/mri_rf_train.cpp
@@ -154,11 +154,7 @@ main(int argc, char *argv[])
   parms.training_fraction = .5 ;
   parms.feature_fraction = 1 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_rf_train.c,v 1.2 2012/05/24 00:04:15 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_rf_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_ribbon/mri_ribbon.cpp b/mri_ribbon/mri_ribbon.cpp
index f3930f75902..d9a5de53e80 100644
--- a/mri_ribbon/mri_ribbon.cpp
+++ b/mri_ribbon/mri_ribbon.cpp
@@ -57,11 +57,7 @@ int main(int argc, char *argv[]) {
   int nargs;
   LABEL *area = NULL ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_ribbon.c,v 1.15 2011/03/02 00:04:24 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ribbon");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_rigid_register/mri_rigid_register.cpp b/mri_rigid_register/mri_rigid_register.cpp
index f6b3f771b37..4f09df195d6 100644
--- a/mri_rigid_register/mri_rigid_register.cpp
+++ b/mri_rigid_register/mri_rigid_register.cpp
@@ -171,8 +171,7 @@ main(int argc, char *argv[]) {
   LTA    *lta ;
   MATRIX *M_reg, *vox_s2vox_t; // *m_coronalras_src2trg;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_rigid_register.c,v 1.17 2015/02/05 23:34:40 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_rigid_register");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_robust_register/lta_diff.cpp b/mri_robust_register/lta_diff.cpp
index dfe42c39522..0c4de329f11 100644
--- a/mri_robust_register/lta_diff.cpp
+++ b/mri_robust_register/lta_diff.cpp
@@ -52,9 +52,6 @@
 
 using namespace std;
 
-static char vcid[] =
-    "$Id: lta_diff.cpp,v 1.77 2016/01/20 23:36:17 greve Exp $";
-
 struct Parameters
 {
   string progname;
@@ -168,7 +165,7 @@ static int parseNextCommand(int argc, char *argv[], Parameters & P)
 static bool parseCommandLine(int argc, char *argv[], Parameters & P)
 {
   // Check for version flag and exit if nothing else is passed:
-  int nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+  int nargs = handleVersionOption(argc, argv, "lta_diff");
   if (nargs && argc - nargs == 1)
   {
     exit(0);
@@ -788,86 +785,7 @@ MATRIX* getIsoVOX(LTA *lta)
 
 int main(int argc, char *argv[])
 {
-
-//testSphereDiff();
-
-//   // Default initialization
-//   int nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
-//   if (nargs && argc - nargs == 1) exit (0);
-//   argc -= nargs;
-//  Progname = argv[0];
-//   argc --;
-//   argv++;
-//  if (vcid)
-//  {};
-
-/*  if (argc < 3)
-  {
-    cout << endl;
-    cout << argv[0] << " file1.lta file2.lta [dist-type] [norm-div] [invert]"
-        << endl;
-    cout << endl;
-    cout << "    dist-type " << endl;
-    cout << "       1            Rigid Transform Distance (||log(R)|| + ||T||)"
-        << endl;
-    cout << "       2  (default) Affine Transform Distance (RMS) " << endl;
-    cout << "       3            8-corners mean distance after transform "
-        << endl;
-    cout << "       4            Max Displacement on Sphere " << endl;
-    cout << "       5            Determinant (scaling) M1*M2" << endl;
-    cout
-        << "       6            Interpolation Smoothing (only for first transform)"
-        << endl;
-    cout << "       7            Decomposition RAS M1*M2 = Rot*Shear*Scaling"
-        << endl;
-    cout << "       8            Decomposition VOX M1*M2 = Rot*Shear*Scaling"
-        << endl;
-    cout << "                       pass 'identity.nofile' for second lta "
-        << endl;
-    cout
-        << "    norm-div  (=1)  divide final distance by this (e.g. step adjustment)"
-        << endl;
-    cout
-        << "    invert          invert LTA: 0 false (default), 1 invert first, 2 second"
-        << endl;
-    cout << endl;
-    cout
-        << " For the RMS and Sphere we use a ball with radius 10cm at the RAS center."
-        << endl;
-    cout << " Instead of 'file2.lta' you can specify 'identity.nofile'."
-        << endl;
-    cout << endl;
-    exit(1);
-  }
-  string lta1f = argv[1];
-  string lta2f = argv[2];
-
-  double d = 1.0;
-  int disttype = 2;
-  if (argc > 3)
-  {
-    disttype = atoi(argv[3]);
-    assert(double(disttype) == atof(argv[3]));
-    if (disttype == 0) 
-    {
-      cerr << "ERROR: dist-type: \"" << argv[3] << "\" not valid, expecting <int>!" << endl;
-      exit(1);
-    }
-  }
-  if (argc > 4)
-    d = atof(argv[4]);
-
-  int invert = 0;
-  if (argc > 5)
-    invert = atoi(argv[5]);
-*/
-
-  if (!parseCommandLine(argc, argv, P))
-  {
-      //printUsage();
-      exit(1);
-  }
-
+  if (!parseCommandLine(argc, argv, P)) exit(1);
 
   if (P.disttype == 100)
   {
diff --git a/mri_robust_register/mri_create_tests.cpp b/mri_robust_register/mri_create_tests.cpp
index 7df66da2668..36fbec147ab 100644
--- a/mri_robust_register/mri_create_tests.cpp
+++ b/mri_robust_register/mri_create_tests.cpp
@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
     cout << vcid << endl;
 
     // Default initialization
-    int nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+    int nargs = handleVersionOption(argc, argv, "mri_create_tests");
     if (nargs && argc - nargs == 1)
       exit(0);
     argc -= nargs;
diff --git a/mri_robust_register/mri_gradient_info.cpp b/mri_robust_register/mri_gradient_info.cpp
index f288d17ac9a..8057e01f4bb 100644
--- a/mri_robust_register/mri_gradient_info.cpp
+++ b/mri_robust_register/mri_gradient_info.cpp
@@ -490,15 +490,7 @@ double scanXold(MRI * mri_in, MRI* mri_grad, MRI* mri_mask)
 int main(int argc, char *argv[])
 {
 
-//   // Default initialization
-//   int nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
-//   if (nargs && argc - nargs == 1) exit (0);
-//   argc -= nargs;
   Progname = argv[0];
-//   argc --;
-//   argv++;
-//  if (vcid)
-//  {};
 
   if (argc < 2)
   {
diff --git a/mri_robust_register/mri_robust_register.cpp b/mri_robust_register/mri_robust_register.cpp
index 02e878ef855..12d6d8172f7 100644
--- a/mri_robust_register/mri_robust_register.cpp
+++ b/mri_robust_register/mri_robust_register.cpp
@@ -602,7 +602,7 @@ int main(int argc, char *argv[])
 //  setenv("FS_USE_MRI_CHUNK","",1) ;
 
     // Default initialization
-    int nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+    int nargs = handleVersionOption(argc, argv, "mri_robust_register");
     if (nargs && argc - nargs == 1)
     {
       exit(0);
diff --git a/mri_robust_register/mri_robust_template.cpp b/mri_robust_register/mri_robust_template.cpp
index c4d3b2c1df5..aad292fa92e 100644
--- a/mri_robust_register/mri_robust_template.cpp
+++ b/mri_robust_register/mri_robust_template.cpp
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
 //  setenv("FS_USE_MRI_CHUNK","",1) ;
 
     // Default initialization
-    int nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+    int nargs = handleVersionOption(argc, argv, "mri_robust_template");
     if (nargs && argc - nargs == 1)
     {
       exit(0);
diff --git a/mri_sbbr/mri_sbbr.cpp b/mri_sbbr/mri_sbbr.cpp
index c9b8baec589..36efe55ea14 100644
--- a/mri_sbbr/mri_sbbr.cpp
+++ b/mri_sbbr/mri_sbbr.cpp
@@ -178,7 +178,7 @@ int main(int argc, char *argv[]) {
   cmdargs->searchnper = 11;
   cmdargs->search1diters = 10;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_sbbr");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_seg_diff/mri_seg_diff.cpp b/mri_seg_diff/mri_seg_diff.cpp
index 6e43ce73c88..5a0d3b7cf38 100644
--- a/mri_seg_diff/mri_seg_diff.cpp
+++ b/mri_seg_diff/mri_seg_diff.cpp
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
   int nargs, DiffFlag=0;
   MRI *seg1, *seg2, *diff;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_seg_diff");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_seg_overlap/mri_seg_overlap.cpp b/mri_seg_overlap/mri_seg_overlap.cpp
index d7e89663fcf..d66ddd11ccf 100644
--- a/mri_seg_overlap/mri_seg_overlap.cpp
+++ b/mri_seg_overlap/mri_seg_overlap.cpp
@@ -43,7 +43,7 @@ static double computeJaccard(IntermediateMetrics &im) {
 }
 
 
-int main(int argc, const char **argv) 
+int main(int argc, char **argv) 
 {
   // ------ parse arguments ------
 
diff --git a/mri_segment/mri_segment.cpp b/mri_segment/mri_segment.cpp
index b90eff00dbb..38540878fdc 100644
--- a/mri_segment/mri_segment.cpp
+++ b/mri_segment/mri_segment.cpp
@@ -128,11 +128,7 @@ int main(int argc, char *argv[])
 
   TAGmakeCommandLineString(argc, argv, cmdline) ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_segment.c,v 1.44 2016/10/22 17:29:37 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_segment");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_segreg/mri_segreg.cpp b/mri_segreg/mri_segreg.cpp
index d897c664f2d..c609a35f7ae 100644
--- a/mri_segreg/mri_segreg.cpp
+++ b/mri_segreg/mri_segreg.cpp
@@ -347,7 +347,6 @@ int InitSurfCostOnly=0;
 
 /*---------------------------------------------------------------*/
 int main(int argc, char **argv) {
-  char cmdline[CMD_LINE_LEN] ;
   double costs[8], mincost, p[12], pmin[6];
   double tx, ty, tz, ax, ay, az;
   int nth, n, vno;
@@ -364,16 +363,9 @@ int main(int argc, char **argv) {
 
   memset(pmin,0,sizeof(pmin));
 
-  make_cmd_version_string
-    (argc, argv,
-     "$Id: mri_segreg.c,v 1.113 2016/05/10 03:23:20 greve Exp $",
-     "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_segreg");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mri_segreg.c,v 1.113 2016/05/10 03:23:20 greve Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_segreg");
   if(nargs && argc - nargs == 1) exit (0);
 
   cmdline2 = argv2cmdline(argc,argv);
diff --git a/mri_segstats/mri_segstats.cpp b/mri_segstats/mri_segstats.cpp
index ade79678ffc..de5749678f9 100644
--- a/mri_segstats/mri_segstats.cpp
+++ b/mri_segstats/mri_segstats.cpp
@@ -219,8 +219,7 @@ int main(int argc, char **argv)
   nhits = 0;
   vol = 0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_segstats");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_stats2seg/mri_stats2seg.cpp b/mri_stats2seg/mri_stats2seg.cpp
index f17379e3a9f..38ba03ac54f 100644
--- a/mri_stats2seg/mri_stats2seg.cpp
+++ b/mri_stats2seg/mri_stats2seg.cpp
@@ -126,7 +126,7 @@ int main(int argc, char *argv[]) {
   int nargs,r,c,s,n,segid,err;
   double val;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_stats2seg");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_strip_nonwhite/mri_strip_nonwhite.cpp b/mri_strip_nonwhite/mri_strip_nonwhite.cpp
index 20672e27eeb..b9a7776b6f8 100644
--- a/mri_strip_nonwhite/mri_strip_nonwhite.cpp
+++ b/mri_strip_nonwhite/mri_strip_nonwhite.cpp
@@ -67,8 +67,7 @@ main(int argc, char *argv[]) {
   M3D    *m3d ;
   int     msec ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_strip_nonwhite.c,v 1.9 2011/03/02 00:04:25 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_strip_nonwhite");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_strip_subject_info/mri_strip_subject_info.cpp b/mri_strip_subject_info/mri_strip_subject_info.cpp
index 95e23c53045..c58a7af0aff 100644
--- a/mri_strip_subject_info/mri_strip_subject_info.cpp
+++ b/mri_strip_subject_info/mri_strip_subject_info.cpp
@@ -55,8 +55,7 @@ int main(int argc, char *argv[]) {
   int i;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_strip_subject_info.c,v 1.6 2011/03/02 00:04:25 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_strip_subject_info");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_surf2surf/mri_surf2surf.cpp b/mri_surf2surf/mri_surf2surf.cpp
index 257ceb4c386..14557640891 100644
--- a/mri_surf2surf/mri_surf2surf.cpp
+++ b/mri_surf2surf/mri_surf2surf.cpp
@@ -512,11 +512,7 @@ int main(int argc, char **argv)
   MRI *inmask = NULL, *outmask=NULL, *mri2=NULL;
   char *stem, *ext;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (
-    argc, argv,
-    "$Id: mri_surf2surf.c,v 1.103 2015/11/05 22:07:33 greve Exp $",
-    "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_surf2surf");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_surf2vol/mri_surf2vol.cpp b/mri_surf2vol/mri_surf2vol.cpp
index fbec6f9cc27..9bd27a5df6c 100644
--- a/mri_surf2vol/mri_surf2vol.cpp
+++ b/mri_surf2vol/mri_surf2vol.cpp
@@ -141,11 +141,7 @@ int main(int argc, char **argv) {
   int nargs;
   int n ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_surf2vol.c,v 1.28 2014/12/08 19:49:02 greve Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_surf2vol");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_surfacemask/mri_surfacemask.cpp b/mri_surfacemask/mri_surfacemask.cpp
index 7afb8acc397..e4afa32f8dc 100644
--- a/mri_surfacemask/mri_surfacemask.cpp
+++ b/mri_surfacemask/mri_surfacemask.cpp
@@ -168,11 +168,7 @@ void markOutsideVoxels(MRI *mri_filled) {
 }
 
 int main(int argc, char *argv[]) {
-  /* rkt: check for and handle version tag */
-  int nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_surfacemask.cpp,v 1.5 2011/03/02 00:04:25 nicks Exp $", 
-     "$Name:  $");
+  int nargs = handleVersionOption(argc, argv, "mri_surfacemask");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_surfcluster/mri_surfcluster.cpp b/mri_surfcluster/mri_surfcluster.cpp
index ac190a7c0d5..3288b9b338d 100644
--- a/mri_surfcluster/mri_surfcluster.cpp
+++ b/mri_surfcluster/mri_surfcluster.cpp
@@ -183,8 +183,7 @@ int main(int argc, char **argv) {
   char *cmdline, cwd[2000];
   double cmaxsize,fwhmvtx;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_surfcluster.c,v 1.60 2016/11/01 19:49:22 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_surfcluster");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_synthesize/mri_synthesize.cpp b/mri_synthesize/mri_synthesize.cpp
index 4e5e35cc70f..dbd31f8a078 100644
--- a/mri_synthesize/mri_synthesize.cpp
+++ b/mri_synthesize/mri_synthesize.cpp
@@ -105,12 +105,10 @@ main(int argc, char *argv[]) {
   MRI         *mri_T1, *mri_PD, *mri_out, *mri_T2star = NULL ;
   float       TR, TE, alpha ;
 
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string (argc, argv, "$Id: mri_synthesize.c,v 1.19 2015/02/05 23:34:40 zkaufman Exp $", "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_synthesize");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_synthesize.c,v 1.19 2015/02/05 23:34:40 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_synthesize");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_tessellate/mri_tessellate.cpp b/mri_tessellate/mri_tessellate.cpp
index 17dfe7c1592..209a09f79e9 100644
--- a/mri_tessellate/mri_tessellate.cpp
+++ b/mri_tessellate/mri_tessellate.cpp
@@ -125,7 +125,7 @@ static void check_face(MRI *mri, int im0, int i0, int j0,
                        int im1, int i1,int j1,
                        int f, int n, int v_ind, int prev_flag) ;
 static void make_surface(MRI *mri) ;
-static void write_binary_surface(char *fname, MRI *mri, char *cmdline) ;
+static void write_binary_surface(char *fname, MRI *mri, std::string& cmdline) ;
 static int get_option(int argc, char *argv[]) ;
 static void usage_exit(int code);
 
@@ -134,21 +134,14 @@ int UseMRIStessellate=0;
 
 int main(int argc, char *argv[])
 {
-  char cmdline[CMD_LINE_LEN], ofpref[STRLEN] /*,*data_dir*/;
+  char ofpref[STRLEN] /*,*data_dir*/;
   int  nargs ;
   MRI *mri = 0;
   int xnum, ynum, numimg;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_tessellate.c,v 1.39 2016/07/20 21:05:04 zkaufman Exp $",
-   "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_tessellate");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_tessellate.c,v 1.39 2016/07/20 21:05:04 zkaufman Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_tessellate");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
@@ -482,7 +475,7 @@ static void make_surface(MRI *mri)
 #define V4_LOAD(v, x, y, z, r)  (VECTOR_ELT(v,1)=x, VECTOR_ELT(v,2)=y, \
                                   VECTOR_ELT(v,3)=z, VECTOR_ELT(v,4)=r) ;
 
-static void write_binary_surface(char *fname, MRI *mri, char *cmdline)
+static void write_binary_surface(char *fname, MRI *mri, std::string& cmdline)
 {
   int k,n;
   double x,y,z;
@@ -582,7 +575,7 @@ static void write_binary_surface(char *fname, MRI *mri, char *cmdline)
     getVolGeom(mri, &vg);
     writeVolGeom(fp, &vg);
   }
-  TAGwrite(fp, TAG_CMDLINE, cmdline, strlen(cmdline)+1) ;
+  TAGwrite(fp, TAG_CMDLINE, &cmdline[0], cmdline.size() + 1) ;
 #endif
 
   fclose(fp);
diff --git a/mri_train/mri_train.cpp b/mri_train/mri_train.cpp
index 4af3cc41811..e05f772489b 100644
--- a/mri_train/mri_train.cpp
+++ b/mri_train/mri_train.cpp
@@ -120,8 +120,7 @@ main(int argc, char *argv[]) {
   int     nargs, error, i ;
   double    accuracy =0 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_train.c,v 1.23 2012/04/12 23:18:57 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_transform/mri_transform.cpp b/mri_transform/mri_transform.cpp
index 776560c35f9..e68d581de23 100644
--- a/mri_transform/mri_transform.cpp
+++ b/mri_transform/mri_transform.cpp
@@ -104,8 +104,7 @@ main(int argc, char *argv[]) {
   exit(1);
 #endif
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_transform.c,v 1.18 2013/04/21 17:10:41 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_transform");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_twoclass/mri_twoclass.cpp b/mri_twoclass/mri_twoclass.cpp
index 59e609400ae..a0c7538e3f8 100644
--- a/mri_twoclass/mri_twoclass.cpp
+++ b/mri_twoclass/mri_twoclass.cpp
@@ -150,8 +150,7 @@ main(int argc, char *argv[]) {
   TRANSFORM    *transform ;
   VLI          *vli1 = NULL, *vli2 = NULL ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_twoclass.c,v 1.16 2015/02/05 23:34:40 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_twoclass");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_vol2surf/mri_vol2surf.cpp b/mri_vol2surf/mri_vol2surf.cpp
index 7bbe71262de..ee7a5f4653e 100644
--- a/mri_vol2surf/mri_vol2surf.cpp
+++ b/mri_vol2surf/mri_vol2surf.cpp
@@ -217,11 +217,7 @@ int main(int argc, char **argv) {
   int r,c,s,nsrchits;
   LTA *lta;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mri_vol2surf.c,v 1.68 2014/05/30 20:58:47 greve Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_vol2surf");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_vol2vol/mri_vol2vol.cpp b/mri_vol2vol/mri_vol2vol.cpp
index 7573635fcca..9b3b2bc29ea 100644
--- a/mri_vol2vol/mri_vol2vol.cpp
+++ b/mri_vol2vol/mri_vol2vol.cpp
@@ -626,7 +626,6 @@ int DownSample[3] = {0,0,0}; // downsample source
 /*---------------------------------------------------------------*/
 int main(int argc, char **argv) {
   char regfile0[1000];
-  char cmdline[CMD_LINE_LEN] ;
   double costs[8];
   FILE *fp;
   int n,err;
@@ -636,14 +635,7 @@ int main(int argc, char **argv) {
 
   vg_isEqual_Threshold = 10e-4;
 
-  make_cmd_version_string(argc, argv,
-                          "$Id: mri_vol2vol.c,v 1.89 2016/06/22 22:33:40 fischl Exp $",
-                          "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option(argc, argv,
-                                "$Id: mri_vol2vol.c,v 1.89 2016/06/22 22:33:40 fischl Exp $",
-                                "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_vol2vol");
   if(nargs && argc - nargs == 1) exit (0);
 
   Progname = argv[0] ;
diff --git a/mri_volcluster/mri_volcluster.cpp b/mri_volcluster/mri_volcluster.cpp
index fdcdcdc6b17..21c5bd78e42 100644
--- a/mri_volcluster/mri_volcluster.cpp
+++ b/mri_volcluster/mri_volcluster.cpp
@@ -212,12 +212,7 @@ int main(int argc, char **argv) {
 
   setRandomSeed(53);
 
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (argc, argv,
-     "$Id: mri_volcluster.c,v 1.49 2016/11/01 19:51:04 greve Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_volcluster");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_voldiff/mri_voldiff.cpp b/mri_voldiff/mri_voldiff.cpp
index fdab711f468..5cae73cf80d 100644
--- a/mri_voldiff/mri_voldiff.cpp
+++ b/mri_voldiff/mri_voldiff.cpp
@@ -94,8 +94,7 @@ int main(int argc, char **argv) {
   double maxdiff,d;
   int cmax,rmax,smax,fmax;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_voldiff");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_warp_convert/mri_warp_convert.cpp b/mri_warp_convert/mri_warp_convert.cpp
index 2fd19b7caa8..355c25fc326 100644
--- a/mri_warp_convert/mri_warp_convert.cpp
+++ b/mri_warp_convert/mri_warp_convert.cpp
@@ -410,7 +410,7 @@ int main(int argc, char *argv[])
   cout << vcid << endl << endl;
 
   // Default initialization
-  int nargs = handle_version_option(argc, argv, vcid, "$Name:  $");
+  int nargs = handleVersionOption(argc, argv, "mri_warp_convert");
   if (nargs && argc - nargs == 1)
   {
     exit(0);
diff --git a/mri_watershed/mri_watershed.cpp b/mri_watershed/mri_watershed.cpp
index 47c86b522f9..4cec15d646c 100644
--- a/mri_watershed/mri_watershed.cpp
+++ b/mri_watershed/mri_watershed.cpp
@@ -922,13 +922,8 @@ int main(int argc, char *argv[])
   GCA_PRIOR *gcap;
   float value_brain, value_cer, value_cergw;
   STRIP_PARMS *parms;
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mri_watershed.cpp,v 1.103 2016/06/17 18:00:49 zkaufman Exp $",
-   "$Name:  $",
-   cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mri_watershed");
 
   Progname=argv[0];
 
@@ -936,11 +931,7 @@ int main(int argc, char *argv[])
 
   /************* Command line****************/
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_watershed.cpp,v 1.103 2016/06/17 18:00:49 zkaufman Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_watershed");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mri_wbc/mri_wbc.cpp b/mri_wbc/mri_wbc.cpp
index c060605a66a..b3cc3a66434 100644
--- a/mri_wbc/mri_wbc.cpp
+++ b/mri_wbc/mri_wbc.cpp
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]) {
   cmdargs->nrholist = 0;
   cmdargs->ForceFail = 0;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_wbc");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mri_xvolavg/mri_xvolavg.cpp b/mri_xvolavg/mri_xvolavg.cpp
index bc4d066bdb4..c9635aded30 100644
--- a/mri_xvolavg/mri_xvolavg.cpp
+++ b/mri_xvolavg/mri_xvolavg.cpp
@@ -88,8 +88,7 @@ int main(int argc, char **argv) {
   int nthvol;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_xvolavg.c,v 1.6 2011/03/02 00:04:26 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_xvolavg");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mri_z2p/mri_z2p.cpp b/mri_z2p/mri_z2p.cpp
index 44f8f4632dd..d3a5f7da238 100644
--- a/mri_z2p/mri_z2p.cpp
+++ b/mri_z2p/mri_z2p.cpp
@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) {
   int nargs, nthzstat;
   char tmpstr[1000];
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_z2p");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris2rgb/mris2rgb.cpp b/mris2rgb/mris2rgb.cpp
index 484efe4da2f..ef31073ff86 100644
--- a/mris2rgb/mris2rgb.cpp
+++ b/mris2rgb/mris2rgb.cpp
@@ -213,8 +213,7 @@ main(int argc, char *argv[]) {
   unsigned short  *red=NULL, *green=NULL, *blue=NULL;
   unsigned char   *rgb=NULL;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris2rgb.c,v 1.38 2011/03/02 00:04:26 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris2rgb");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_BA_segment/mris_BA_segment.cpp b/mris_BA_segment/mris_BA_segment.cpp
index 5ffb396c334..91a4cc5d958 100644
--- a/mris_BA_segment/mris_BA_segment.cpp
+++ b/mris_BA_segment/mris_BA_segment.cpp
@@ -75,8 +75,7 @@ main(int argc, char *argv[])
   LABEL         *lprior, *lout ;
   MRI           *mri ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_BA_segment.c,v 1.4 2015/02/05 23:34:40 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_BA_segment");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_anatomical_stats/mris_anatomical_stats.cpp b/mris_anatomical_stats/mris_anatomical_stats.cpp
index dbba6a45759..96f2bcd558b 100644
--- a/mris_anatomical_stats/mris_anatomical_stats.cpp
+++ b/mris_anatomical_stats/mris_anatomical_stats.cpp
@@ -122,11 +122,7 @@ main(int argc, char *argv[])
   float         mean_cortex_thickness = 0;
   double voxelvolume=0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_anatomical_stats.c,v 1.79 2016/03/14 15:15:34 greve Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_anatomical_stats");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_annot_diff/mris_annot_diff.cpp b/mris_annot_diff/mris_annot_diff.cpp
index 6cb8102b02d..90a029c5622 100644
--- a/mris_annot_diff/mris_annot_diff.cpp
+++ b/mris_annot_diff/mris_annot_diff.cpp
@@ -5,7 +5,7 @@
 #include "mris_annot_diff.help.xml.h"
  
 
-int main(int argc, const char *argv[])
+int main(int argc, char *argv[])
 {
   ArgumentParser parser;
   parser.addHelp(mris_annot_diff_help_xml, mris_annot_diff_help_xml_len);
diff --git a/mris_annot_to_segmentation/mris_annot_to_segmentation.cpp b/mris_annot_to_segmentation/mris_annot_to_segmentation.cpp
index d9f9c9fbde6..02a169445e3 100644
--- a/mris_annot_to_segmentation/mris_annot_to_segmentation.cpp
+++ b/mris_annot_to_segmentation/mris_annot_to_segmentation.cpp
@@ -68,8 +68,7 @@ main(int argc, char *argv[]) {
   double idxx, idxy, idxz;
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_annot_to_segmentation.c,v 1.8 2011/03/02 00:04:26 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_annot_to_segmentation");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_apply_reg/mris_apply_reg.cpp b/mris_apply_reg/mris_apply_reg.cpp
index 504c9bc2a08..0ada072cae6 100644
--- a/mris_apply_reg/mris_apply_reg.cpp
+++ b/mris_apply_reg/mris_apply_reg.cpp
@@ -113,7 +113,7 @@ int main(int argc, char *argv[]) {
   char *base;
   COLOR_TABLE *ctab=NULL;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_apply_reg");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_average_curvature/mris_average_curvature.cpp b/mris_average_curvature/mris_average_curvature.cpp
index 0dc4017bfb0..9fbf3e440f7 100644
--- a/mris_average_curvature/mris_average_curvature.cpp
+++ b/mris_average_curvature/mris_average_curvature.cpp
@@ -70,8 +70,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   MRI_SP       *mrisp, *mrisp_total ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_average_curvature.c,v 1.17 2011/03/02 00:04:26 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_average_curvature");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_ca_label/mris_ca_label.cpp b/mris_ca_label/mris_ca_label.cpp
index 577d788d59c..9a2fc5aea5e 100644
--- a/mris_ca_label/mris_ca_label.cpp
+++ b/mris_ca_label/mris_ca_label.cpp
@@ -104,8 +104,7 @@ main(int argc, char *argv[])
   MRI_SURFACE  *mris ;
   GCSA         *gcsa ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_ca_label");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_ca_train/mris_ca_train.cpp b/mris_ca_train/mris_ca_train.cpp
index 1c3f3bf53b6..ce0bbd43ca5 100644
--- a/mris_ca_train/mris_ca_train.cpp
+++ b/mris_ca_train/mris_ca_train.cpp
@@ -118,8 +118,7 @@ main(int argc, char *argv[])
   GCSA         *gcsa ;
   int          unknown_index = -1 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_ca_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_calc/mris_calc.cpp b/mris_calc/mris_calc.cpp
index 9b0e12492ac..a58760e1676 100644
--- a/mris_calc/mris_calc.cpp
+++ b/mris_calc/mris_calc.cpp
@@ -1440,10 +1440,7 @@ main(
   e_FILEACCESS  eACCESS;
 
   init();
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_calc.c,v 1.55 2016/09/27 18:50:16 greve Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_calc");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_compute_acorr/mris_compute_acorr.cpp b/mris_compute_acorr/mris_compute_acorr.cpp
index 7b58a1db214..5aed159bcef 100644
--- a/mris_compute_acorr/mris_compute_acorr.cpp
+++ b/mris_compute_acorr/mris_compute_acorr.cpp
@@ -132,8 +132,7 @@ main(int argc, char *argv[]) {
   LABEL        *area ;
   FILE         *fp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_compute_acorr.c,v 1.7 2011/03/02 00:04:30 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_compute_acorr");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_compute_overlap/mris_compute_overlap.cpp b/mris_compute_overlap/mris_compute_overlap.cpp
index 5572eae1787..8385735111e 100644
--- a/mris_compute_overlap/mris_compute_overlap.cpp
+++ b/mris_compute_overlap/mris_compute_overlap.cpp
@@ -66,11 +66,7 @@ main(int argc, char *argv[]) {
   MRIS   *mris ;
   FILE   *log_fp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_compute_overlap.c,v 1.6 2011/03/02 00:04:30 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_compute_overlap");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_compute_parc_overlap/mris_compute_parc_overlap.cpp b/mris_compute_parc_overlap/mris_compute_parc_overlap.cpp
index 17000eec6b4..f0a46070d00 100644
--- a/mris_compute_parc_overlap/mris_compute_parc_overlap.cpp
+++ b/mris_compute_parc_overlap/mris_compute_parc_overlap.cpp
@@ -152,7 +152,8 @@ int main(int argc, char *argv[])
   memset(skippedLabels,0,sizeof(skippedLabels));
 
   // command-line processing...
-  int nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  int nargs;
+  nargs = handleVersionOption(argc, argv, "mris_compute_parc_overlap");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
 
diff --git a/mris_compute_volume_fractions/mris_compute_volume_fractions.cpp b/mris_compute_volume_fractions/mris_compute_volume_fractions.cpp
index bd29e009141..c590025e860 100644
--- a/mris_compute_volume_fractions/mris_compute_volume_fractions.cpp
+++ b/mris_compute_volume_fractions/mris_compute_volume_fractions.cpp
@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
   printf("working!\n");
   int nargs;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_compute_volume_fractions");
 
   if (nargs && argc - nargs == 1) exit (0);
 
diff --git a/mris_congeal/mris_congeal.cpp b/mris_congeal/mris_congeal.cpp
index 46972361bdb..bd245044be5 100644
--- a/mris_congeal/mris_congeal.cpp
+++ b/mris_congeal/mris_congeal.cpp
@@ -143,19 +143,10 @@ main(int argc, char *argv[])
   MRI_SURFACE  *mris_array[MAX_SUBJECTS], *mris_ico ;
   MRI_SP       *mrisp_template ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string 
-    (argc, argv, 
-     "$Id: mris_congeal.c,v 1.4 2011/03/02 00:04:30 nicks Exp $", 
-     "$Name:  $", 
-     cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_congeal.c,v 1.4 2011/03/02 00:04:30 nicks Exp $", 
-     "$Name:  $");
+
+  std::string cmdline = getAllInfo(argc, argv, "mris_congeal");
+
+  nargs = handleVersionOption(argc, argv, "mris_congeal");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_convert/mris_convert.cpp b/mris_convert/mris_convert.cpp
index b100ea0d00e..b23c79e0cbb 100644
--- a/mris_convert/mris_convert.cpp
+++ b/mris_convert/mris_convert.cpp
@@ -148,11 +148,7 @@ main(int argc, char *argv[])
   char *in2_fname=NULL;
   MRI_SURFACE *mris2=NULL;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id$",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_convert");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_curvature/mris_curvature.cpp b/mris_curvature/mris_curvature.cpp
index c7308808f76..6c3fa2eab8c 100644
--- a/mris_curvature/mris_curvature.cpp
+++ b/mris_curvature/mris_curvature.cpp
@@ -89,11 +89,7 @@ main(int argc, char *argv[])
   MRI_SURFACE  *mris ;
   double       ici, fi, var ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mris_curvature.c,v 1.31 2011/03/02 00:04:30 nicks Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_curvature");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_curvature_stats/mris_curvature_stats.cpp b/mris_curvature_stats/mris_curvature_stats.cpp
index 4ae59ee88fe..2d206273ea3 100644
--- a/mris_curvature_stats/mris_curvature_stats.cpp
+++ b/mris_curvature_stats/mris_curvature_stats.cpp
@@ -517,9 +517,7 @@ main(int argc, char *argv[])
 
   GpSTDOUT  = stdout;
 //  InitDebugging( "mris_curvature_stats" );
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv,
-                                 "$Id: mris_curvature_stats.c,v 1.65 2015/06/04 20:50:51 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_curvature_stats");
   if (nargs && argc - nargs == 1) {
     exit (0);
   }
diff --git a/mris_decimate/main.cpp b/mris_decimate/main.cpp
index 451ee7441dc..f5ada268990 100644
--- a/mris_decimate/main.cpp
+++ b/mris_decimate/main.cpp
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
   MRI_SURFACE *mris;
   double avgfacearea ;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "main");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_defects_pointset/mris_defects_pointset.cpp b/mris_defects_pointset/mris_defects_pointset.cpp
index 3fff9e28ab9..63f9726ebc4 100644
--- a/mris_defects_pointset/mris_defects_pointset.cpp
+++ b/mris_defects_pointset/mris_defects_pointset.cpp
@@ -18,7 +18,7 @@
 
 static PointSet::Point sras2ras(MRIS* surf, PointSet::Point point);
 
-int main(int argc, const char **argv) 
+int main(int argc, char **argv) 
 {
 
   // --- setup ----
diff --git a/mris_deform/mris_ca_deform.cpp b/mris_deform/mris_ca_deform.cpp
index fcb6faec821..5d81fd0233b 100644
--- a/mris_deform/mris_ca_deform.cpp
+++ b/mris_deform/mris_ca_deform.cpp
@@ -112,7 +112,7 @@ main(int argc, char *argv[]) {
   int         msec, minutes, seconds, n_averages ;
   float        current_sigma ;
   Timer start ;
-  char         cmdline[CMD_LINE_LEN], *cp ;
+  char        *cp ;
   HISTOGRAM   *histos[MAX_LABEL+1] ;
   VERTEX_INFO *vi ;
   TRANSFORM   *transform ;
@@ -138,13 +138,9 @@ main(int argc, char *argv[]) {
   // parms.l_surf_repulse = .1 ;
   parms.dt = parms.base_dt = 0.5 ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_ca_deform.c,v 1.2 2011/03/02 00:04:31 nicks Exp $",
-   "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mris_ca_deform");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_ca_deform.c,v 1.2 2011/03/02 00:04:31 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_ca_deform");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_deform/mris_deform.cpp b/mris_deform/mris_deform.cpp
index 6be58399698..869b9f6bffc 100644
--- a/mris_deform/mris_deform.cpp
+++ b/mris_deform/mris_deform.cpp
@@ -299,8 +299,7 @@ main(int argc, char *argv[]) {
   dp.min_sg_width = .5 ;
   dp.min_ig_width = .75 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_deform.c,v 1.29 2011/03/02 00:04:31 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_deform");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_deform/mris_nudge.cpp b/mris_deform/mris_nudge.cpp
index 9fba5893923..620aa386099 100644
--- a/mris_deform/mris_nudge.cpp
+++ b/mris_deform/mris_nudge.cpp
@@ -66,7 +66,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   MRI          *mri ;
 
-  nargs = handle_version_option (argc, argv, "$Id: mris_nudge.c,v 1.3 2012/08/08 13:10:32 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_nudge");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_diff/mris_diff.cpp b/mris_diff/mris_diff.cpp
index dd1d896cdf8..74d7476668b 100644
--- a/mris_diff/mris_diff.cpp
+++ b/mris_diff/mris_diff.cpp
@@ -378,7 +378,7 @@ int main(int argc, char *argv[]) {
   FACE *face1, *face2;
   float maxdiff, rms;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_diff");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_distance_map/mris_distance_map.cpp b/mris_distance_map/mris_distance_map.cpp
index 76386149a75..40c74a0c69a 100644
--- a/mris_distance_map/mris_distance_map.cpp
+++ b/mris_distance_map/mris_distance_map.cpp
@@ -76,11 +76,7 @@ main(int argc, char *argv[])
   int          ac, nargs ;
   MRI          *mri_distance ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_distance_map.c,v 1.2 2011/03/02 00:04:31 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_distance_map");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_distance_to_label/mris_distance_to_label.cpp b/mris_distance_to_label/mris_distance_to_label.cpp
index b21cc2b9063..0a90350758c 100644
--- a/mris_distance_to_label/mris_distance_to_label.cpp
+++ b/mris_distance_to_label/mris_distance_to_label.cpp
@@ -198,11 +198,7 @@ int main(int argc, char *argv[]) {
   int msec, minutes, seconds ;
   Timer start;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mris_distance_to_label.cpp,v 1.8 2011/03/02 00:04:31 nicks Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_distance_to_label");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_distance_transform/mris_distance_transform.cpp b/mris_distance_transform/mris_distance_transform.cpp
index f215f1773b5..4a08d584ff5 100644
--- a/mris_distance_transform/mris_distance_transform.cpp
+++ b/mris_distance_transform/mris_distance_transform.cpp
@@ -72,11 +72,7 @@ main(int argc, char *argv[])
   Timer then ;
   MRI           *mri_dist ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_distance_transform.c,v 1.5 2013/04/12 20:59:17 fischl Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_distance_transform");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_divide_parcellation/mris_divide_parcellation.cpp b/mris_divide_parcellation/mris_divide_parcellation.cpp
index 5703cbe7ae1..36bc5cc6868 100644
--- a/mris_divide_parcellation/mris_divide_parcellation.cpp
+++ b/mris_divide_parcellation/mris_divide_parcellation.cpp
@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) {
   *subject, *hemi ;
   float       area_thresh ;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_divide_parcellation");
   if (nargs && argc - nargs == 1)  exit (0);
   argc -= nargs;
 
diff --git a/mris_entropy/mris_entropy.cpp b/mris_entropy/mris_entropy.cpp
index 6811bb0e632..3bd4abe1e27 100644
--- a/mris_entropy/mris_entropy.cpp
+++ b/mris_entropy/mris_entropy.cpp
@@ -65,8 +65,7 @@ main(int argc, char *argv[]) {
   VERTEX             *v ;
   double             entropy, total_len, min_w ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_entropy.c,v 1.7 2011/03/02 00:04:31 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_entropy");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_errors/mris_errors.cpp b/mris_errors/mris_errors.cpp
index 9bfcdeae63f..e8f1b423584 100644
--- a/mris_errors/mris_errors.cpp
+++ b/mris_errors/mris_errors.cpp
@@ -67,8 +67,7 @@ main(int argc, char *argv[]) {
   name[100], hemi[100] ;
   int          ac, nargs ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_errors.c,v 1.11 2011/03/02 00:04:31 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_errors");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_euler_number/mris_euler_number.cpp b/mris_euler_number/mris_euler_number.cpp
index 7c1f9e6d28d..176ad999f2e 100644
--- a/mris_euler_number/mris_euler_number.cpp
+++ b/mris_euler_number/mris_euler_number.cpp
@@ -62,11 +62,7 @@ main(int argc, char *argv[])
   int          ac, nargs, nvertices, nfaces, nedges, eno, dno ;
   MRI_SURFACE  *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mris_euler_number.c,v 1.10 2013/01/14 22:39:14 greve Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_euler_number");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_expand/mris_expand.cpp b/mris_expand/mris_expand.cpp
index 40c3fbe6144..c1dedb77b6f 100644
--- a/mris_expand/mris_expand.cpp
+++ b/mris_expand/mris_expand.cpp
@@ -76,11 +76,7 @@ main(int argc, char *argv[])
   parms.l_repulse = 0.025 ;
   parms.dt = 0.25 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mris_expand.c,v 1.16 2017/02/16 19:45:00 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_expand");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_extract_patches/mris_extract_patches.cpp b/mris_extract_patches/mris_extract_patches.cpp
index d88c3630660..3e100aad438 100644
--- a/mris_extract_patches/mris_extract_patches.cpp
+++ b/mris_extract_patches/mris_extract_patches.cpp
@@ -75,11 +75,7 @@ main(int argc, char *argv[])
   LABEL        *area_tmp, *area ;
   int          random_patches, npoints, *non_fcd_vertices = NULL, augment_patches ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mris_extract_patches.c,v 1.16 2017/02/16 19:45:00 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_extract_patches");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_fill/mris_fill.cpp b/mris_fill/mris_fill.cpp
index 90de8962697..9256f5bd6bf 100644
--- a/mris_fill/mris_fill.cpp
+++ b/mris_fill/mris_fill.cpp
@@ -68,15 +68,10 @@ main(int argc, char *argv[]) {
   MRI_SURFACE   *mris ;
   MRI           *mri_interior, *mri_template = NULL, *mri_buffer = NULL;
 
-  char cmdline[CMD_LINE_LEN] ;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_fill.c,v 1.6 2011/03/02 00:04:32 nicks Exp $", "$Name:  $",
-   cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mris_fill");
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_fill.c,v 1.6 2011/03/02 00:04:32 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_fill");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_find_flat_regions/mris_find_flat_regions.cpp b/mris_find_flat_regions/mris_find_flat_regions.cpp
index b97929b771e..971605e3b79 100644
--- a/mris_find_flat_regions/mris_find_flat_regions.cpp
+++ b/mris_find_flat_regions/mris_find_flat_regions.cpp
@@ -62,8 +62,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE        *mris ;
   VERTEX             *v ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_find_flat_regions.c,v 1.4 2011/03/02 00:04:32 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_find_flat_regions");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_fix_topology/mris_fix_topology.cpp b/mris_fix_topology/mris_fix_topology.cpp
index 5a047db9f3b..9413bab33cc 100644
--- a/mris_fix_topology/mris_fix_topology.cpp
+++ b/mris_fix_topology/mris_fix_topology.cpp
@@ -106,22 +106,10 @@ main(int argc, char *argv[])
   float         max_len ;
   Timer then ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc,
-   argv,
-   "$Id: mris_fix_topology.c,v 1.51 2016/10/27 19:43:58 fischl Exp $",
-   "$Name:  $",
-   cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (argc,
-     argv,
-     "$Id: mris_fix_topology.c,v 1.51 2016/10/27 19:43:58 fischl Exp $",
-     "$Name:  $");
+
+  std::string cmdline = getAllInfo(argc, argv, "mris_fix_topology");
+
+  nargs = handleVersionOption(argc, argv, "mris_fix_topology");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_fix_topology/mris_remove_intersection.cpp b/mris_fix_topology/mris_remove_intersection.cpp
index abff50096ea..aa310a613d7 100644
--- a/mris_fix_topology/mris_remove_intersection.cpp
+++ b/mris_fix_topology/mris_remove_intersection.cpp
@@ -60,18 +60,10 @@ int main(int argc, char *argv[])
   MRI_SURFACE  *mris ;
   Timer then ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_remove_intersection.c,v 1.6 2011/03/02 00:04:32 nicks Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_remove_intersection.c,v 1.6 2011/03/02 00:04:32 nicks Exp $",
-           "$Name:  $");
+
+  std::string cmdline = getAllInfo(argc, argv, "mris_remove_intersection");
+
+  nargs = handleVersionOption(argc, argv, "mris_remove_intersection");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_flatten/mris_flatten.cpp b/mris_flatten/mris_flatten.cpp
index fd40db33e44..9ed5cf9a1db 100644
--- a/mris_flatten/mris_flatten.cpp
+++ b/mris_flatten/mris_flatten.cpp
@@ -266,11 +266,7 @@ main(int argc, char *argv[])
   MRI_SURFACE  *mris ;
   MRI          *mri_vertices ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_flatten.c,v 1.42 2016/12/10 22:57:46 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_flatten");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_fwhm/mris_fwhm.cpp b/mris_fwhm/mris_fwhm.cpp
index 618e5ba3edf..e35e94cfcbd 100644
--- a/mris_fwhm/mris_fwhm.cpp
+++ b/mris_fwhm/mris_fwhm.cpp
@@ -224,7 +224,7 @@ int main(int argc, char *argv[]) {
   MRI *ar1=NULL;
   FILE *fp;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_fwhm");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_hausdorff_dist/mris_hausdorff_dist.cpp b/mris_hausdorff_dist/mris_hausdorff_dist.cpp
index fec3ad14223..8a43caa7b03 100644
--- a/mris_hausdorff_dist/mris_hausdorff_dist.cpp
+++ b/mris_hausdorff_dist/mris_hausdorff_dist.cpp
@@ -66,11 +66,7 @@ main(int argc, char *argv[])
   Timer then ;
   double        hdist ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_hausdorff_dist.c,v 1.3 2011/03/02 00:04:32 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_hausdorff_dist");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_inflate/mris_inflate.cpp b/mris_inflate/mris_inflate.cpp
index bf8122573d5..42c727b3a23 100644
--- a/mris_inflate/mris_inflate.cpp
+++ b/mris_inflate/mris_inflate.cpp
@@ -87,18 +87,10 @@ main(int argc, char *argv[])
   Timer then ;
   float         radius ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_inflate.c,v 1.45 2016/01/20 23:42:15 greve Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_inflate.c,v 1.45 2016/01/20 23:42:15 greve Exp $",
-           "$Name:  $");
+
+  std::string cmdline = getAllInfo(argc, argv, "mris_inflate");
+
+  nargs = handleVersionOption(argc, argv, "mris_inflate");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_init_global_tractography/mris_init_global_tractography.cpp b/mris_init_global_tractography/mris_init_global_tractography.cpp
index 9dc232675a0..ce5b5aa3f70 100644
--- a/mris_init_global_tractography/mris_init_global_tractography.cpp
+++ b/mris_init_global_tractography/mris_init_global_tractography.cpp
@@ -138,8 +138,7 @@ main(int argc, char *argv[]) {
   CMAT         *cmat ;
   MRI          *mri_tmp, *mri_wm_only ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_init_global_tractography.c,v 1.4 2016/07/18 15:42:20 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_init_global_tractography");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_interpolate_warp/mris_interpolate_warp.cpp b/mris_interpolate_warp/mris_interpolate_warp.cpp
index befab6f788b..9648dac6368 100644
--- a/mris_interpolate_warp/mris_interpolate_warp.cpp
+++ b/mris_interpolate_warp/mris_interpolate_warp.cpp
@@ -294,8 +294,7 @@ main(int argc, char *argv[])
   GCA_MORPH    *gcam ;
   MRI          *mri = NULL ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_interpolate_warp.c,v 1.5 2011/10/07 12:07:26 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_interpolate_warp");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_jacobian/mris_jacobian.cpp b/mris_jacobian/mris_jacobian.cpp
index dc180b1ddb9..0ddd6bd3e93 100644
--- a/mris_jacobian/mris_jacobian.cpp
+++ b/mris_jacobian/mris_jacobian.cpp
@@ -64,11 +64,7 @@ main(int argc, char *argv[])
   int          ac, nargs ;
   MRI_SURFACE  *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_jacobian.c,v 1.11 2015/02/05 23:34:40 zkaufman Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_jacobian");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_label2annot/mris_label2annot.cpp b/mris_label2annot/mris_label2annot.cpp
index bfec1cc6f51..7907bee9220 100644
--- a/mris_label2annot/mris_label2annot.cpp
+++ b/mris_label2annot/mris_label2annot.cpp
@@ -211,7 +211,7 @@ int IndexOffset=0;
 int main(int argc, char *argv[]) {
   int nargs, nthlabel, n, vtxno, ano, index, nunhit;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_label2annot");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_label_area/mris_label_area.cpp b/mris_label_area/mris_label_area.cpp
index 0cd722e5487..ad495eefc3a 100644
--- a/mris_label_area/mris_label_area.cpp
+++ b/mris_label_area/mris_label_area.cpp
@@ -63,8 +63,7 @@ main(int argc, char *argv[]) {
   MRIS   *mris ;
   FILE   *log_fp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_label_area.c,v 1.6 2011/03/02 00:04:32 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_label_area");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_label_calc/mris_label_calc.cpp b/mris_label_calc/mris_label_calc.cpp
index e747d83bf46..8678b0293aa 100644
--- a/mris_label_calc/mris_label_calc.cpp
+++ b/mris_label_calc/mris_label_calc.cpp
@@ -64,15 +64,7 @@ void printUsage()
 int main(int argc, char *argv[])
 {
 
-//   // Default initialization
-//   int nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
-//   if (nargs && argc - nargs == 1) exit (0);
-//   argc -= nargs;
   Progname = argv[0] ;
-//   argc --;
-//   argv++;
-//  if (vcid)
-//  {};
 
   if (argc < 5)
   {
diff --git a/mris_label_mode/mris_label_mode.cpp b/mris_label_mode/mris_label_mode.cpp
index 6312b530f69..a341219d214 100644
--- a/mris_label_mode/mris_label_mode.cpp
+++ b/mris_label_mode/mris_label_mode.cpp
@@ -86,8 +86,7 @@ main(int argc, char *argv[]) {
 
   int u,v,index;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_label_mode.c,v 1.6 2011/03/02 00:04:32 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_label_mode");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_left_right_register/mris_left_right_register.cpp b/mris_left_right_register/mris_left_right_register.cpp
index c986da30a54..f1f51851169 100644
--- a/mris_left_right_register/mris_left_right_register.cpp
+++ b/mris_left_right_register/mris_left_right_register.cpp
@@ -126,19 +126,7 @@ main(int argc, char *argv[])
   MRI_SP       *mrisp_template ;
   float        *lh_coords[3], *rh_coords[3], **coords ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_left_right_register.c,v 1.2 2011/12/16 20:49:37 greve Exp $",
-   "$Name:  $",
-   cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_left_right_register.c,v 1.2 2011/12/16 20:49:37 greve Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_left_right_register");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_make_average_surface/mris_make_average_surface.cpp b/mris_make_average_surface/mris_make_average_surface.cpp
index 1419c233550..bec661c58d6 100644
--- a/mris_make_average_surface/mris_make_average_surface.cpp
+++ b/mris_make_average_surface/mris_make_average_surface.cpp
@@ -152,11 +152,7 @@ main(int argc, char *argv[]) {
 
   memset((void *) &vg, 0, sizeof (VOL_GEOM));
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_make_average_surface.c,v 1.30 2013/04/11 20:41:58 greve Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_make_average_surface");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_make_face_parcellation/mris_make_face_parcellation.cpp b/mris_make_face_parcellation/mris_make_face_parcellation.cpp
index 10b2e9d7f24..8a3ef6de098 100644
--- a/mris_make_face_parcellation/mris_make_face_parcellation.cpp
+++ b/mris_make_face_parcellation/mris_make_face_parcellation.cpp
@@ -171,7 +171,6 @@ main(int argc, char *argv[]) {
   MRI_SURFACE        *mris, *mris_ico ;
   float              radius ;
   int                fno, vno, annot,k ;
-  char               cmdline[CMD_LINE_LEN] ;
   double             fdist ;
   FACE               *face ;
   MHT                *mht ;
@@ -190,18 +189,11 @@ main(int argc, char *argv[]) {
   
   Timer start;
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_make_face_parcellation.c,v 1.22 2016/05/06 17:26:14 fischl Exp $",
-   "$Name:  $", cmdline);
+  std::string cmdline = getAllInfo(argc, argv, "mris_make_face_parcellation");
 
   setRandomSeed(1L) ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-    (argc, argv,
-     "$Id: mris_make_face_parcellation.c,v 1.22 2016/05/06 17:26:14 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_make_face_parcellation");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_make_surfaces/mris_autodet_gwstats.cpp b/mris_make_surfaces/mris_autodet_gwstats.cpp
index cacc77fe971..077f2180031 100644
--- a/mris_make_surfaces/mris_autodet_gwstats.cpp
+++ b/mris_make_surfaces/mris_autodet_gwstats.cpp
@@ -84,8 +84,7 @@ int main(int argc, char **argv)
   int nargs;
   char *cmdline2, cwd[2000];
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_autodet_gwstats");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_make_surfaces/mris_exvivo_surfaces.cpp b/mris_make_surfaces/mris_exvivo_surfaces.cpp
index d77ee30399f..236f767abc4 100644
--- a/mris_make_surfaces/mris_exvivo_surfaces.cpp
+++ b/mris_make_surfaces/mris_exvivo_surfaces.cpp
@@ -216,18 +216,10 @@ main(int argc, char *argv[]) {
   double        current_sigma ;
   Timer then ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string 
-    (argc, argv, 
-     "$Id: mris_exvivo_surfaces.c,v 1.9 2015/02/05 23:34:41 zkaufman Exp $", 
-     "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_exvivo_surfaces.c,v 1.9 2015/02/05 23:34:41 zkaufman Exp $", 
-     "$Name:  $");
+
+  std::string cmdline = getAllInfo(argc, argv, "mris_exvivo_surfaces");
+
+  nargs = handleVersionOption(argc, argv, "mris_exvivo_surfaces");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_make_surfaces/mris_make_surfaces.cpp b/mris_make_surfaces/mris_make_surfaces.cpp
index 3e330a37f96..ff47b79467e 100644
--- a/mris_make_surfaces/mris_make_surfaces.cpp
+++ b/mris_make_surfaces/mris_make_surfaces.cpp
@@ -326,22 +326,14 @@ int main(int argc, char *argv[])
   INTEGRATION_PARMS old_parms ;
   int memusage[5];
   char *cmdline2, cwd[2000];
-  char cmdline[CMD_LINE_LEN] ;
   MRIS *mristarget = NULL;
   int vno;
   VERTEX *vgdiag;
 
   FSinit() ;
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_make_surfaces.c,v 1.172 2017/02/16 19:42:36 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_make_surfaces.c,v 1.172 2017/02/16 19:42:36 fischl Exp $",
-           "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mris_make_surfaces");
+
+  nargs = handleVersionOption(argc, argv, "mris_make_surfaces");
   getcwd(cwd,2000);
   cmdline2 = argv2cmdline(argc,argv);
 
diff --git a/mris_make_surfaces/mris_mef_surfaces.cpp b/mris_make_surfaces/mris_mef_surfaces.cpp
index c803dbd1046..378edc4d361 100644
--- a/mris_make_surfaces/mris_mef_surfaces.cpp
+++ b/mris_make_surfaces/mris_mef_surfaces.cpp
@@ -192,19 +192,9 @@ main(int argc, char *argv[]) {
   double        current_sigma ;
   Timer then ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string 
-    (argc, argv, 
-     "$Id: mris_mef_surfaces.c,v 1.7 2015/02/05 23:34:41 zkaufman Exp $", 
-     "$Name:  $", 
-     cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_mef_surfaces.c,v 1.7 2015/02/05 23:34:41 zkaufman Exp $", 
-     "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mris_mef_surfaces");
+
+  nargs = handleVersionOption(argc, argv, "mris_mef_surfaces");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_make_surfaces/mris_place_surface.cpp b/mris_make_surfaces/mris_place_surface.cpp
index 82305bb4c3d..e76d7a8f9da 100644
--- a/mris_make_surfaces/mris_place_surface.cpp
+++ b/mris_make_surfaces/mris_place_surface.cpp
@@ -247,8 +247,7 @@ int main(int argc, char **argv)
   AutoDetGWStats adgws;
   //char *field=NULL;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_place_surface");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_make_surfaces/mris_refine_surfaces.cpp b/mris_make_surfaces/mris_refine_surfaces.cpp
index 9d15a68575f..42fa9142da1 100644
--- a/mris_make_surfaces/mris_refine_surfaces.cpp
+++ b/mris_make_surfaces/mris_refine_surfaces.cpp
@@ -196,11 +196,7 @@ main(int argc, char *argv[]) {
   MATRIX        *m_reg = NULL ;
   /*  LT            *lt =0;*/
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_refine_surfaces.c,v 1.23 2016/12/10 22:57:53 fischl Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_refine_surfaces");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_make_template/mris_make_template.cpp b/mris_make_template/mris_make_template.cpp
index bc60cbfa6c3..6e0127602d8 100644
--- a/mris_make_template/mris_make_template.cpp
+++ b/mris_make_template/mris_make_template.cpp
@@ -101,11 +101,7 @@ main(int argc, char *argv[])
   MRI_SP       *mrisp, /* *mrisp_aligned,*/ *mrisp_template ;
   INTEGRATION_PARMS parms ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_make_template.c,v 1.27 2011/03/02 00:04:33 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_make_template");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_map_cuts/mris_map_cuts.cpp b/mris_map_cuts/mris_map_cuts.cpp
index cd441699cdd..bfa8e8514e9 100644
--- a/mris_map_cuts/mris_map_cuts.cpp
+++ b/mris_map_cuts/mris_map_cuts.cpp
@@ -61,8 +61,7 @@ main(int argc, char *argv[]) {
   Timer start ;
   MRI_SURFACE  *mris_in, *mris_out ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_map_cuts.c,v 1.3 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_map_cuts");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_merge_parcellations/mris_merge_parcellations.cpp b/mris_merge_parcellations/mris_merge_parcellations.cpp
index 16bc38adb27..46af607dfba 100644
--- a/mris_merge_parcellations/mris_merge_parcellations.cpp
+++ b/mris_merge_parcellations/mris_merge_parcellations.cpp
@@ -64,11 +64,7 @@ main(int argc, char *argv[])
   Timer then ;
   COLOR_TABLE   *ct ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_merge_parcellations.c,v 1.6 2011/03/02 00:04:33 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_merge_parcellations");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_mesh_subdivide/mris_mesh_subdivide.cxx b/mris_mesh_subdivide/mris_mesh_subdivide.cxx
index a5d971bb909..1128ab95d04 100644
--- a/mris_mesh_subdivide/mris_mesh_subdivide.cxx
+++ b/mris_mesh_subdivide/mris_mesh_subdivide.cxx
@@ -125,17 +125,8 @@ int main(int argc, char *argv[])
   int          msec, minutes, seconds ;
   Timer start ;
 
-  char cmdline[CMD_LINE_LEN] ;
+  std::string cmdline = getAllInfo(argc, argv, "mris_mesh_subdivide");
 
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_mesh_subdivide.cxx,v 1.5 2013/02/07 16:04:07 jonp Exp $",
-   "$Name:  $", cmdline);
-
-
-  //nargs = handle_version_option (argc, argv,
-  //   "$Id: mris_mesh_subdivide.cxx,v 1.5 2013/02/07 16:04:07 jonp Exp $",
-  //   "$Name:  $");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_morph_stats/mris_morph_stats.cpp b/mris_morph_stats/mris_morph_stats.cpp
index 48ed7079340..3429253b1f8 100644
--- a/mris_morph_stats/mris_morph_stats.cpp
+++ b/mris_morph_stats/mris_morph_stats.cpp
@@ -65,8 +65,7 @@ main(int argc, char *argv[]) {
   int           ac, nargs ;
   MRI_SURFACE   *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_morph_stats.c,v 1.6 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_morph_stats");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_ms_refine/mris_ms_refine.cpp b/mris_ms_refine/mris_ms_refine.cpp
index 4a1f539e2ca..5b959cabb39 100644
--- a/mris_ms_refine/mris_ms_refine.cpp
+++ b/mris_ms_refine/mris_ms_refine.cpp
@@ -330,8 +330,7 @@ main(int argc, char *argv[]) {
   LTA           *lta ;
   EXTRA_PARMS   ep ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_ms_refine.c,v 1.20 2015/02/05 23:34:41 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_ms_refine");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_multiscale_stats/mris_multiscale_stats.cpp b/mris_multiscale_stats/mris_multiscale_stats.cpp
index 2219f744787..dab488dbe16 100644
--- a/mris_multiscale_stats/mris_multiscale_stats.cpp
+++ b/mris_multiscale_stats/mris_multiscale_stats.cpp
@@ -168,8 +168,7 @@ main(int argc, char *argv[]) {
   Timer start ;
   int          msec, minutes, seconds ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_multiscale_stats.c,v 1.6 2015/02/05 23:34:41 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_multiscale_stats");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_niters2fwhm/mris_niters2fwhm.cpp b/mris_niters2fwhm/mris_niters2fwhm.cpp
index 69547a875c0..261c399fa03 100644
--- a/mris_niters2fwhm/mris_niters2fwhm.cpp
+++ b/mris_niters2fwhm/mris_niters2fwhm.cpp
@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) {
   nthiter = 0;
   mri = var = mri0 = delta = deltasm = xyz = NULL;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_niters2fwhm");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_parcellate_connectivity/mris_parcellate_connectivity.cpp b/mris_parcellate_connectivity/mris_parcellate_connectivity.cpp
index 6b9595b8aa4..f61a69092c1 100644
--- a/mris_parcellate_connectivity/mris_parcellate_connectivity.cpp
+++ b/mris_parcellate_connectivity/mris_parcellate_connectivity.cpp
@@ -71,8 +71,7 @@ main(int argc, char *argv[]) {
 
   setRandomSeed(1L) ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_parcellate_connectivity.c,v 1.2 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_parcellate_connectivity");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_register/mris_register.cpp b/mris_register/mris_register.cpp
index 18cecdc5a01..82e409b30cc 100644
--- a/mris_register/mris_register.cpp
+++ b/mris_register/mris_register.cpp
@@ -145,19 +145,10 @@ main(int argc, char *argv[])
   MRI_SURFACE  *mris ;
   MRI_SP       *mrisp_template ;
 
-  char cmdline[CMD_LINE_LEN],cwd[2000],*cmdline2 ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_register.c,v 1.64 2017/02/07 19:04:44 fischl Exp $",
-   "$Name:  $",
-   cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_register.c,v 1.64 2017/02/07 19:04:44 fischl Exp $",
-           "$Name:  $");
+  char cwd[2000],*cmdline2 ;
+  std::string cmdline = getAllInfo(argc, argv, "mris_register");
+
+  nargs = handleVersionOption(argc, argv, "mris_register");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_register_label_map/mris_register_label_map.cpp b/mris_register_label_map/mris_register_label_map.cpp
index 2297bdd6660..b86bcee05e6 100644
--- a/mris_register_label_map/mris_register_label_map.cpp
+++ b/mris_register_label_map/mris_register_label_map.cpp
@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
   MRI_SURFACE *mris_lh_mov, *mris_rh_mov, *mris_lh_fixed, *mris_rh_fixed ;
   MATRIX      *m_map_weights ;
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_register_label_map");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_register_to_volume/mris_register_to_label.cpp b/mris_register_to_volume/mris_register_to_label.cpp
index 0d41fae2ba3..28671854c53 100644
--- a/mris_register_to_volume/mris_register_to_label.cpp
+++ b/mris_register_to_volume/mris_register_to_label.cpp
@@ -194,20 +194,13 @@ static char vcid[] = "$Id: mris_register_to_label.c,v 1.3 2013/06/07 18:56:17 fi
 int
 main(int argc, char **argv) 
 {
-  char          cmdline[CMD_LINE_LEN], fname[STRLEN] ;
+  char          fname[STRLEN] ;
   MRI           *mri_dist, *mri_src ;
   LABEL         *area, *ltmp ;
   int           msec, nargs ;
   Timer then ;
 
-  make_cmd_version_string(argc, argv,
-                          "$Id: mris_register_to_label.c,v 1.3 2013/06/07 18:56:17 fischl Exp $",
-                          "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option(argc, argv,
-                                "$Id: mris_register_to_label.c,v 1.3 2013/06/07 18:56:17 fischl Exp $",
-                                "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_register_to_label");
   if(nargs && argc - nargs == 1) exit (0);
 
   Progname = argv[0] ;
diff --git a/mris_register_to_volume/mris_register_to_volume.cpp b/mris_register_to_volume/mris_register_to_volume.cpp
index bd0b0b01f2d..b64022d776e 100644
--- a/mris_register_to_volume/mris_register_to_volume.cpp
+++ b/mris_register_to_volume/mris_register_to_volume.cpp
@@ -255,7 +255,7 @@ static double (*similarity_func)
 int
 main(int argc, char **argv) 
 {
-  char          cmdline[CMD_LINE_LEN], *saved_pial_fname ;
+  char          *saved_pial_fname ;
   MRI_SURFACE   *mris ;
   int           skip, i, msec ;
   MRI           *mri_kernel, *mri_smooth, *mri_mask, *mri_mag ;
@@ -267,14 +267,7 @@ main(int argc, char **argv)
   MATRIX        *m_save = NULL ;
   Timer then ;
 
-  make_cmd_version_string(argc, argv,
-                          "$Id: mris_register_to_volume.c,v 1.10 2011/03/02 00:04:33 nicks Exp $",
-                          "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option(argc, argv,
-                                "$Id: mris_register_to_volume.c,v 1.10 2011/03/02 00:04:33 nicks Exp $",
-                                "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_register_to_volume");
   if(nargs && argc - nargs == 1) exit (0);
 
   Progname = argv[0] ;
diff --git a/mris_remesh/mris_remesh.cpp b/mris_remesh/mris_remesh.cpp
index c2fb28e3580..a9b1edd17a6 100644
--- a/mris_remesh/mris_remesh.cpp
+++ b/mris_remesh/mris_remesh.cpp
@@ -5,7 +5,7 @@
 #include "mris_remesh.help.xml.h"
 
 
-int main(int argc, const char **argv) 
+int main(int argc, char **argv) 
 {
   ArgumentParser parser;
   parser.addHelp(mris_remesh_help_xml, mris_remesh_help_xml_len);
diff --git a/mris_remove_variance/mris_remove_variance.cpp b/mris_remove_variance/mris_remove_variance.cpp
index 3ab51f67f6a..7ae2099c77b 100644
--- a/mris_remove_variance/mris_remove_variance.cpp
+++ b/mris_remove_variance/mris_remove_variance.cpp
@@ -64,8 +64,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   double       r ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_remove_variance.c,v 1.7 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_remove_variance");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_resample/mris_resample.cpp b/mris_resample/mris_resample.cpp
index b942c844a61..948de5edf82 100644
--- a/mris_resample/mris_resample.cpp
+++ b/mris_resample/mris_resample.cpp
@@ -95,11 +95,11 @@ struct IoParams
   std::string strOutput;
   std::string strOutAnnotation;
 
-  void parse(int ac, const char** av);
+  void parse(int ac, char** av);
 };
 
 int
-main(int ac, const char** av)
+main(int ac, char** av)
 {
   // parse cmd-line
   IoParams params;
@@ -153,7 +153,7 @@ main(int ac, const char** av)
 }
 
 void
-IoParams::parse(int ac, const char** av)
+IoParams::parse(int ac, char** av)
 {
   ArgumentParser parser;
   // required
diff --git a/mris_rescale/mris_rescale.cpp b/mris_rescale/mris_rescale.cpp
index 80859177e17..2b07065df55 100644
--- a/mris_rescale/mris_rescale.cpp
+++ b/mris_rescale/mris_rescale.cpp
@@ -60,8 +60,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   float        radius, scale ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_rescale.c,v 1.5 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_rescale");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_reverse/mris_reverse.cpp b/mris_reverse/mris_reverse.cpp
index f2ae7d84ac0..0093a574f9b 100644
--- a/mris_reverse/mris_reverse.cpp
+++ b/mris_reverse/mris_reverse.cpp
@@ -62,8 +62,7 @@ main(int argc, char *argv[]) {
   int                ac, nargs ;
   MRI_SURFACE        *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_reverse.c,v 1.10 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_reverse");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_rf_label/mris_rf_label.cpp b/mris_rf_label/mris_rf_label.cpp
index 26bfe6fdbf5..45ea6ad1168 100644
--- a/mris_rf_label/mris_rf_label.cpp
+++ b/mris_rf_label/mris_rf_label.cpp
@@ -77,8 +77,7 @@ main(int argc, char *argv[]) {
   MRI           *mri_labels ;
   VERTEX        *v ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_rf_label.c,v 1.2 2016/12/11 15:13:53 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_rf_label");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_rf_train/mris_rf_train.cpp b/mris_rf_train/mris_rf_train.cpp
index 428c6d915b9..3a77066a205 100644
--- a/mris_rf_train/mris_rf_train.cpp
+++ b/mris_rf_train/mris_rf_train.cpp
@@ -91,8 +91,7 @@ main(int argc, char *argv[]) {
   double        **training_data ;
   int           *training_classes, ntraining, n_omp_threads;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_rf_train.c,v 1.3 2016/12/11 14:33:34 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_rf_train");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_rotate/mris_rotate.cpp b/mris_rotate/mris_rotate.cpp
index e9b282f4bf7..9e698482444 100644
--- a/mris_rotate/mris_rotate.cpp
+++ b/mris_rotate/mris_rotate.cpp
@@ -59,8 +59,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE  *mris ;
   float        alpha, beta, gamma ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_rotate.c,v 1.6 2011/03/02 00:04:33 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_rotate");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_sample_parc/mris_sample_parc.cpp b/mris_sample_parc/mris_sample_parc.cpp
index 715a86e1747..94463a15c5c 100644
--- a/mris_sample_parc/mris_sample_parc.cpp
+++ b/mris_sample_parc/mris_sample_parc.cpp
@@ -101,9 +101,7 @@ main(int argc, char *argv[]) {
   double        d ;
   double        x, y, z, xw, yw, zw ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv,
-                                 "$Id: mris_sample_parc.c,v 1.31 2016/12/11 14:33:38 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_sample_parc");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_seg2annot/mris_seg2annot.cpp b/mris_seg2annot/mris_seg2annot.cpp
index 86058c48474..294da5114e3 100644
--- a/mris_seg2annot/mris_seg2annot.cpp
+++ b/mris_seg2annot/mris_seg2annot.cpp
@@ -140,7 +140,7 @@ int main(int argc, char *argv[]) {
   int nargs,nv;
   char tmpstr[2000];
 
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_seg2annot");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/mris_segment/mris_segment.cpp b/mris_segment/mris_segment.cpp
index 6ebac1fa7b7..81f5ae874f0 100644
--- a/mris_segment/mris_segment.cpp
+++ b/mris_segment/mris_segment.cpp
@@ -595,11 +595,7 @@ main(int argc, char *argv[])
   MRI          *mri_frame, *mri, *mri_out, *mri_prior ;
   LABEL        *labels[MAX_SUBJECTS], *area ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_segment.c,v 1.10 2016/12/11 14:33:41 fischl Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_segment");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_segment_vals/mris_segment_vals.cpp b/mris_segment_vals/mris_segment_vals.cpp
index 85c9f6cd3d3..793d4b19af3 100644
--- a/mris_segment_vals/mris_segment_vals.cpp
+++ b/mris_segment_vals/mris_segment_vals.cpp
@@ -63,8 +63,7 @@ main(int argc, char *argv[]) {
   VERTEX             *v ;
   LABEL              **label_array ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_segment_vals.c,v 1.5 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_segment_vals");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_segmentation_stats/mris_segmentation_stats.cpp b/mris_segmentation_stats/mris_segmentation_stats.cpp
index 342893078bb..c71149c43fa 100644
--- a/mris_segmentation_stats/mris_segmentation_stats.cpp
+++ b/mris_segmentation_stats/mris_segmentation_stats.cpp
@@ -74,7 +74,7 @@ main(int argc, char *argv[]) {
   MRI          *mri_overlays[MAX_SUBJECTS] ;
   MRI_SURFACE  *mris[MAX_SUBJECTS] ;
 
-  nargs = handle_version_option (argc, argv, "$Id: mris_segmentation_stats.c,v 1.2 2012/08/26 00:41:44 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_segmentation_stats");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_shrinkwrap/mris_AA_shrinkwrap.cpp b/mris_shrinkwrap/mris_AA_shrinkwrap.cpp
index 6f46bf94ee2..8bf4f7a75e4 100644
--- a/mris_shrinkwrap/mris_AA_shrinkwrap.cpp
+++ b/mris_shrinkwrap/mris_AA_shrinkwrap.cpp
@@ -122,8 +122,7 @@ main(int argc, char *argv[]) {
   MRI_SEGMENTATION *mriseg ;
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_AA_shrinkwrap.c,v 1.6 2015/02/05 23:34:41 zkaufman Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_AA_shrinkwrap");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_shrinkwrap/mris_shrinkwrap.cpp b/mris_shrinkwrap/mris_shrinkwrap.cpp
index 54e4d359d79..5c0106de14f 100644
--- a/mris_shrinkwrap/mris_shrinkwrap.cpp
+++ b/mris_shrinkwrap/mris_shrinkwrap.cpp
@@ -109,11 +109,7 @@ main(int argc, char *argv[])
   Timer then ;
   double        l_spring ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_shrinkwrap.c,v 1.9 2012/11/10 20:19:46 fischl Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_shrinkwrap");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_simulate_atrophy/mris_simulate_atrophy.cpp b/mris_simulate_atrophy/mris_simulate_atrophy.cpp
index 8b7d1cfb59e..e16167941f8 100644
--- a/mris_simulate_atrophy/mris_simulate_atrophy.cpp
+++ b/mris_simulate_atrophy/mris_simulate_atrophy.cpp
@@ -107,12 +107,7 @@ main(int argc, char *argv[])
   MATRIX       *m_vox2vox ;
   char         extension[STRLEN] ;
 
-  /* rkt: check for and handle version tag */
-  nargs = 
-    handle_version_option
-    (argc, argv,
-     "$Id: mris_simulate_atrophy.c,v 1.3 2013/05/18 21:16:30 fischl Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_simulate_atrophy");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_smooth/mris_smooth.cpp b/mris_smooth/mris_smooth.cpp
index 1a02fcaee68..d727c125033 100644
--- a/mris_smooth/mris_smooth.cpp
+++ b/mris_smooth/mris_smooth.cpp
@@ -86,18 +86,9 @@ main(int argc, char *argv[])
   int                ac, nargs, start_t, pass ;
   MRI_SURFACE        *mris ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_smooth.c,v 1.30 2014/01/21 18:48:21 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_smooth.c,v 1.30 2014/01/21 18:48:21 fischl Exp $",
-           "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mris_smooth");
+
+  nargs = handleVersionOption(argc, argv, "mris_smooth");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_sphere/mris_remove_negative_vertices.cpp b/mris_sphere/mris_remove_negative_vertices.cpp
index c21129d0137..b0684bc34e2 100644
--- a/mris_sphere/mris_remove_negative_vertices.cpp
+++ b/mris_sphere/mris_remove_negative_vertices.cpp
@@ -66,18 +66,9 @@ main(int argc, char *argv[])
   MRI_SURFACE  *mris ;
   Timer then ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string 
-    (argc, argv, 
-     "$Id: mris_remove_negative_vertices.c,v 1.5 2011/03/02 00:04:34 nicks Exp $", 
-     "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_remove_negative_vertices.c,v 1.5 2011/03/02 00:04:34 nicks Exp $", 
-     "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mris_remove_negative_vertices");
+
+  nargs = handleVersionOption(argc, argv, "mris_remove_negative_vertices");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_sphere/mris_sphere.cpp b/mris_sphere/mris_sphere.cpp
index f68ad927391..b92e5db7b3d 100644
--- a/mris_sphere/mris_sphere.cpp
+++ b/mris_sphere/mris_sphere.cpp
@@ -119,18 +119,9 @@ main(int argc, char *argv[])
   Timer then ;
   float        max_dim ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc, argv,
-   "$Id: mris_sphere.c,v 1.62 2017/02/07 19:04:37 fischl Exp $",
-   "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_sphere.c,v 1.62 2017/02/07 19:04:37 fischl Exp $",
-           "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mris_sphere");
+
+  nargs = handleVersionOption(argc, argv, "mris_sphere");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_spherical_average/mris_spherical_average.cpp b/mris_spherical_average/mris_spherical_average.cpp
index 307bee2b168..42f8b15ebfd 100644
--- a/mris_spherical_average/mris_spherical_average.cpp
+++ b/mris_spherical_average/mris_spherical_average.cpp
@@ -97,12 +97,9 @@ main(int argc, char *argv[])
   LABEL           *area, *area_avg = NULL ;
   float           average_label_area = 0 ;
 
-  char cmdline[CMD_LINE_LEN] ;
+  std::string cmdline = getAllInfo(argc, argv, "mris_spherical_average");
 
-  make_cmd_version_string (argc, argv, "$Id: mris_spherical_average.c,v 1.38 2016/12/11 14:33:44 fischl Exp $", "$Name:  $", cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_spherical_average.c,v 1.38 2016/12/11 14:33:44 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_spherical_average");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_surface_stats/mris_surface_stats.cpp b/mris_surface_stats/mris_surface_stats.cpp
index 97cf2583c56..2345c2560a5 100644
--- a/mris_surface_stats/mris_surface_stats.cpp
+++ b/mris_surface_stats/mris_surface_stats.cpp
@@ -103,11 +103,7 @@ main(int argc, char *argv[])
   int    msec, minutes, seconds, nsurfaces, nsurfaces_total ;
   Timer start ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_surface_stats.c,v 1.10 2011/03/02 00:04:34 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_surface_stats");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_surface_to_vol_distances/mris_surface_to_vol_distances.cpp b/mris_surface_to_vol_distances/mris_surface_to_vol_distances.cpp
index 820ed41c325..556e3b1fbb8 100644
--- a/mris_surface_to_vol_distances/mris_surface_to_vol_distances.cpp
+++ b/mris_surface_to_vol_distances/mris_surface_to_vol_distances.cpp
@@ -65,8 +65,7 @@ main(int argc, char *argv[]) {
   float        ***histograms ;
   FILE         *fp ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_surface_to_vol_distances.c,v 1.4 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_surface_to_vol_distances");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_talairach/mris_talairach.cpp b/mris_talairach/mris_talairach.cpp
index 2a3bc52520f..922e733b818 100644
--- a/mris_talairach/mris_talairach.cpp
+++ b/mris_talairach/mris_talairach.cpp
@@ -57,8 +57,7 @@ main(int argc, char *argv[]) {
   char         **av, *in_fname, *out_fname ;
   int          ac, nargs ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_talairach.c,v 1.5 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_talairach");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_thickness/mris_cluster_profiles.cpp b/mris_thickness/mris_cluster_profiles.cpp
index 703cfa6203f..aee3621028f 100644
--- a/mris_thickness/mris_cluster_profiles.cpp
+++ b/mris_thickness/mris_cluster_profiles.cpp
@@ -114,8 +114,7 @@ main(int argc, char *argv[]) {
 
   setRandomSeed(10L) ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_cluster_profiles.c,v 1.4 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_cluster_profiles");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_thickness/mris_gradient.cpp b/mris_thickness/mris_gradient.cpp
index f8ba4d36cee..f5682dc5f33 100644
--- a/mris_thickness/mris_gradient.cpp
+++ b/mris_thickness/mris_gradient.cpp
@@ -71,7 +71,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE   *mris ;
   MRI           *mri, *mri_grad ;
 
-  nargs = handle_version_option (argc, argv, "$Id: mris_gradient.c,v 1.23 2013/03/27 01:53:50 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_gradient");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_thickness/mris_intensity_profile.cpp b/mris_thickness/mris_intensity_profile.cpp
index 3a0bbd49162..b6700c509fd 100644
--- a/mris_thickness/mris_intensity_profile.cpp
+++ b/mris_thickness/mris_intensity_profile.cpp
@@ -148,8 +148,7 @@ main(int argc, char *argv[]) {
   float         *norm = NULL ;
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_intensity_profile.c,v 1.23 2013/03/27 01:53:50 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_intensity_profile");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_thickness/mris_thickness.cpp b/mris_thickness/mris_thickness.cpp
index 9a77be44954..a3bebb26a7c 100644
--- a/mris_thickness/mris_thickness.cpp
+++ b/mris_thickness/mris_thickness.cpp
@@ -86,8 +86,7 @@ main(int argc, char *argv[]) {
   MRI_SURFACE   *mris ;
   Timer then ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_thickness.c,v 1.28 2012/11/27 17:41:26 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_thickness");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_thickness_comparison/mris_thickness_comparison.cpp b/mris_thickness_comparison/mris_thickness_comparison.cpp
index 0a1ab6a35b6..37749563f68 100644
--- a/mris_thickness_comparison/mris_thickness_comparison.cpp
+++ b/mris_thickness_comparison/mris_thickness_comparison.cpp
@@ -69,8 +69,7 @@ main(int argc, char *argv[]) {
   double             mean_w, var_w, mean_thick, var_thick ;
   LABEL              *area ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_thickness_comparison.c,v 1.5 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_thickness_comparison");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_thickness_diff/mris_thickness_diff.cpp b/mris_thickness_diff/mris_thickness_diff.cpp
index 99820f10de6..df1df525c0c 100644
--- a/mris_thickness_diff/mris_thickness_diff.cpp
+++ b/mris_thickness_diff/mris_thickness_diff.cpp
@@ -168,11 +168,7 @@ int main(int argc, char *argv[])
   label = 0;
   annotation = 0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mris_thickness_diff.c,v 1.16 2011/03/02 00:04:34 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_thickness_diff");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_topo_fixer/mris_topo_fixer.cpp b/mris_topo_fixer/mris_topo_fixer.cpp
index 06bc92f6d41..e9641a0a515 100644
--- a/mris_topo_fixer/mris_topo_fixer.cpp
+++ b/mris_topo_fixer/mris_topo_fixer.cpp
@@ -160,23 +160,9 @@ int main(int argc, char *argv[]) {
   int           msec, nvert, nfaces, nedges, eno ,is_valid;
   Timer then ;
 
-  char cmdline[CMD_LINE_LEN] ;
-
-  make_cmd_version_string
-  (argc,
-   argv,
-   "$Id: mris_topo_fixer.cpp,v 1.29 2011/03/02 00:04:34 nicks Exp $",
-   "$Name:  $",
-   cmdline);
-
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (argc,
-     argv,
-     "$Id: mris_topo_fixer.cpp,v 1.29 2011/03/02 00:04:34 nicks Exp $",
-     "$Name:  $");
+  std::string cmdline = getAllInfo(argc, argv, "mris_topo_fixer");
 
+  nargs = handleVersionOption(argc, argv, "mris_topo_fixer");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_transform/mris_transform.cpp b/mris_transform/mris_transform.cpp
index 2cddb8b6e31..8e0889b5b4d 100644
--- a/mris_transform/mris_transform.cpp
+++ b/mris_transform/mris_transform.cpp
@@ -62,8 +62,7 @@ main(int argc, char *argv[]) {
   if (argc == 1)
     print_usage_exit();
   
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_transform.c,v 1.8 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_transform");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_translate_annotation/mris_translate_annotation.cpp b/mris_translate_annotation/mris_translate_annotation.cpp
index 93124934adf..be69bae9e51 100644
--- a/mris_translate_annotation/mris_translate_annotation.cpp
+++ b/mris_translate_annotation/mris_translate_annotation.cpp
@@ -61,8 +61,7 @@ main(int argc, char *argv[]) {
   int          ac, nargs ;
   MRI_SURFACE  *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_translate_annotation.c,v 1.5 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_translate_annotation");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_transmantle_dysplasia_paths/mris_transmantle_dysplasia_paths.cpp b/mris_transmantle_dysplasia_paths/mris_transmantle_dysplasia_paths.cpp
index 0fed4f0f568..fcdaf5e900c 100644
--- a/mris_transmantle_dysplasia_paths/mris_transmantle_dysplasia_paths.cpp
+++ b/mris_transmantle_dysplasia_paths/mris_transmantle_dysplasia_paths.cpp
@@ -101,8 +101,7 @@ main(int argc, char *argv[]) {
   MRI          *mri, *mri_aseg, *mri_pvals ;
   TRANSFORM    *xform ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_transmantle_dysplasia_paths.c,v 1.4 2012/06/16 12:48:24 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_transmantle_dysplasia_paths");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_volmask/mris_volmask.cpp b/mris_volmask/mris_volmask.cpp
index c8b5faa4fd0..1bce6776448 100644
--- a/mris_volmask/mris_volmask.cpp
+++ b/mris_volmask/mris_volmask.cpp
@@ -164,7 +164,7 @@ main(int ac, char* av[])
   Timer then ;
 
   then.reset() ;
-  nargs =handle_version_option( ac, av,"$Id: mris_volmask.cpp,v 1.28 2016/11/18 19:19:29 fischl Exp $","$Name:  $");
+  nargs = handleVersionOption(ac, av, "mris_volmask");
   if (nargs && ac - nargs == 1)
     exit (0);
   ac -= nargs;
diff --git a/mris_volume/mris_volume.cpp b/mris_volume/mris_volume.cpp
index a79830c44f1..93ebbc4bfd9 100644
--- a/mris_volume/mris_volume.cpp
+++ b/mris_volume/mris_volume.cpp
@@ -73,8 +73,7 @@ int main(int argc, char *argv[]) {
   Timer start ;
   double total_volume;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_volume.c,v 1.6 2011/03/02 00:04:34 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_volume");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_volume/mris_wm_volume.cpp b/mris_volume/mris_wm_volume.cpp
index 75d4ca6d59b..d955d54c468 100644
--- a/mris_volume/mris_wm_volume.cpp
+++ b/mris_volume/mris_wm_volume.cpp
@@ -66,11 +66,7 @@ main(int argc, char *argv[])
   double        total_volume ;
   MRI           *mri_aseg ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option 
-    (argc, argv, 
-     "$Id: mris_wm_volume.c,v 1.7 2011/03/02 00:04:34 nicks Exp $", 
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_wm_volume");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mris_warp/mris_warp.cpp b/mris_warp/mris_warp.cpp
index bde4dca5a3d..ed6a1af44b2 100644
--- a/mris_warp/mris_warp.cpp
+++ b/mris_warp/mris_warp.cpp
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
   GCA_MORPH    *gcam1, *gcam2 ;
 
 
-  //  nargs = handle_version_option (argc, argv, "$Id: mris_warp.c,v 1.3 2012/02/29 15:59:46 nicks Exp $", "$Name:  $");
+  // nargs = handleVersionOption(argc, argv, "mris_warp");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mris_watershed/mris_watershed.cpp b/mris_watershed/mris_watershed.cpp
index e1c906d07d8..1e282c97ef4 100644
--- a/mris_watershed/mris_watershed.cpp
+++ b/mris_watershed/mris_watershed.cpp
@@ -63,7 +63,7 @@ main(int argc, char *argv[])
   int         nargs, nlabels ;
   char        *out_fname ;
 
-  nargs = handle_version_option (argc, argv, "$Id: mris_watershed.c,v 1.23 2013/03/27 01:53:50 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_watershed");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/mrisp_paint/mrisp_paint.cpp b/mrisp_paint/mrisp_paint.cpp
index 087da8e0574..7e83bd8ef55 100644
--- a/mrisp_paint/mrisp_paint.cpp
+++ b/mrisp_paint/mrisp_paint.cpp
@@ -81,8 +81,7 @@ main(int argc, char *argv[])
   MRI_SP       *mrisp ;
   VERTEX *v;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mrisp_paint.c,v 1.12 2016/03/22 14:47:57 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mrisp_paint");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/mrisp_write/mrisp_write.cpp b/mrisp_write/mrisp_write.cpp
index 251f4939f62..0d59111ca2a 100644
--- a/mrisp_write/mrisp_write.cpp
+++ b/mrisp_write/mrisp_write.cpp
@@ -86,8 +86,7 @@ main(int argc, char *argv[])
   MRI_SP       *mrisp, *mrisp_contra = NULL ;
   MRI          *mri_overlay ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mrisp_write.c,v 1.12 2016/03/22 14:47:57 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mrisp_write");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/nmovie/nmovie.c b/nmovie/nmovie.c
index 1f0c5fdc7f6..72ed9aaa982 100644
--- a/nmovie/nmovie.c
+++ b/nmovie/nmovie.c
@@ -621,11 +621,7 @@ int main(int argc, char **argv) {
   ErrorInit(NULL, NULL, NULL) ;
   DiagInit(NULL, NULL, NULL) ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: nmovie.c,v 1.31 2012/03/17 20:33:11 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "nmovie");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/oct_register_mosaic/oct_register_mosaic.cpp b/oct_register_mosaic/oct_register_mosaic.cpp
index 8e1dc7bcb23..5b75ac6304c 100644
--- a/oct_register_mosaic/oct_register_mosaic.cpp
+++ b/oct_register_mosaic/oct_register_mosaic.cpp
@@ -121,8 +121,7 @@ main(int argc, char *argv[]) {
   double       x0d[MAX_IMAGES], y0d[MAX_IMAGES], ax[MAX_IMAGES], ay[MAX_IMAGES] ;
 //  HISTOGRAM    *h0 = NULL, *h1 ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: oct_register_mosaic.c,v 1.4 2016/04/18 19:19:35 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "oct_register_mosaic");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/optseq2/optseq2.cpp b/optseq2/optseq2.cpp
index 08e86d747ba..fdae29166a2 100644
--- a/optseq2/optseq2.cpp
+++ b/optseq2/optseq2.cpp
@@ -178,8 +178,7 @@ int main(int argc, char **argv) {
   int Singular;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: optseq2.c,v 2.22 2011/04/21 19:48:51 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "optseq2");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/stat_normalize/stat_normalize.cpp b/stat_normalize/stat_normalize.cpp
index d232ee2795f..d808f834981 100644
--- a/stat_normalize/stat_normalize.cpp
+++ b/stat_normalize/stat_normalize.cpp
@@ -65,12 +65,7 @@ main(int argc, char *argv[]) {
   SV          *sv, *sv_avg = NULL ;
   MRI_SURFACE *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (argc, argv,
-     "$Id: stat_normalize.c,v 1.14 2011/03/02 00:04:40 nicks Exp $",
-     "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "stat_normalize");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
 
diff --git a/stim_polar/stim_polar.cpp b/stim_polar/stim_polar.cpp
index 41d0f2c81f9..56605be6e3d 100644
--- a/stim_polar/stim_polar.cpp
+++ b/stim_polar/stim_polar.cpp
@@ -478,8 +478,7 @@ int main(int argc, char** argv) {
     exit(0) ;
   }
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: stim_polar.c,v 1.10 2011/03/02 00:04:40 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "stim_polar");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/talairach_afd/talairach_afd.cpp b/talairach_afd/talairach_afd.cpp
index e3f5d290961..990d06ff3e4 100644
--- a/talairach_afd/talairach_afd.cpp
+++ b/talairach_afd/talairach_afd.cpp
@@ -86,11 +86,7 @@ int main(int argc, char *argv[])
   sigma=NULL;
   txfm=NULL;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: talairach_afd.c,v 1.13 2011/03/02 00:04:40 nicks Exp $",
-           "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "talairach_afd");
   if (nargs && argc - nargs == 1)
   {
     exit (0);
diff --git a/template/main_template.cpp b/template/main_template.cpp
index f83b0f0f730..04389ba5975 100644
--- a/template/main_template.cpp
+++ b/template/main_template.cpp
@@ -58,8 +58,7 @@ main(int argc, char *argv[]) {
   int          msec, minutes, seconds ;
   Timer start ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: main_template.c,v 1.5 2011/03/02 00:04:40 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "main_template");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/template/mri_elastic_energy.cpp b/template/mri_elastic_energy.cpp
index 1d9d7af4dfa..d5c3139fa83 100644
--- a/template/mri_elastic_energy.cpp
+++ b/template/mri_elastic_energy.cpp
@@ -60,8 +60,7 @@ main(int argc, char *argv[]) {
   GCA_MORPH    *gcam ;
   MRI          *mri_lame ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_elastic_energy.c,v 1.1 2011/10/14 23:28:22 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_elastic_energy");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/template/mri_multiscale_segment.cpp b/template/mri_multiscale_segment.cpp
index 9a443675b4b..9246d722a0a 100644
--- a/template/mri_multiscale_segment.cpp
+++ b/template/mri_multiscale_segment.cpp
@@ -65,8 +65,7 @@ main(int argc, char *argv[]) {
   TRANSFORM    *transform ;
   MRI_SURFACE  *mris ;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_multiscale_segment.c,v 1.1 2011/07/30 20:07:03 fischl Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_multiscale_segment");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/tkregister2/tkregister2.cpp b/tkregister2/tkregister2.cpp
index 643db38f61b..6e8b1d31e5c 100644
--- a/tkregister2/tkregister2.cpp
+++ b/tkregister2/tkregister2.cpp
@@ -4967,11 +4967,7 @@ int main(int argc, char **argv)   /* new main */
 {
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs =
-    handle_version_option
-    (argc, argv,
-     "$Id: tkregister2.c,v 1.133 2016/08/02 21:17:11 greve Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "tkregister2");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/trc/dmri_forrest.cxx b/trc/dmri_forrest.cxx
index 3ccfe98eff3..a59474e32b0 100644
--- a/trc/dmri_forrest.cxx
+++ b/trc/dmri_forrest.cxx
@@ -82,8 +82,7 @@ Timer cputimer;
 int main(int argc, char **argv) {
   int nargs, cputime, nx, ny, nz, ntrain;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_forrest");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_group.cxx b/trc/dmri_group.cxx
index 872e93cf7f3..3f6f02641d6 100644
--- a/trc/dmri_group.cxx
+++ b/trc/dmri_group.cxx
@@ -105,8 +105,7 @@ int main(int argc, char **argv) {
   MATRIX *outv2r;
   MRI *outref = 0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_group");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_mergepaths.cxx b/trc/dmri_mergepaths.cxx
index d580b9d6804..b426283c39e 100644
--- a/trc/dmri_mergepaths.cxx
+++ b/trc/dmri_mergepaths.cxx
@@ -84,8 +84,7 @@ int main(int argc, char **argv) {
   char fname[PATH_MAX];
   MRI *invol = 0, *outvol = 0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_mergepaths");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_motion.cxx b/trc/dmri_motion.cxx
index f808fbd6f4e..79702d31245 100644
--- a/trc/dmri_motion.cxx
+++ b/trc/dmri_motion.cxx
@@ -93,8 +93,7 @@ int main(int argc, char **argv) {
   string matline;
   ofstream outfile;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_motion");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_paths.cxx b/trc/dmri_paths.cxx
index a137a3b5623..00d559dea08 100644
--- a/trc/dmri_paths.cxx
+++ b/trc/dmri_paths.cxx
@@ -99,8 +99,7 @@ int main(int argc, char **argv) {
        dopropinit = true;
   int nargs, cputime, ilab1 = 0, ilab2 = 0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_paths");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_pathstats.cxx b/trc/dmri_pathstats.cxx
index 98e62794319..05bbc435de4 100644
--- a/trc/dmri_pathstats.cxx
+++ b/trc/dmri_pathstats.cxx
@@ -97,8 +97,7 @@ int main(int argc, char **argv) {
   vector<MRI *> meas;
   ofstream fout;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_pathstats");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_spline.cxx b/trc/dmri_spline.cxx
index 69d17658dca..73d97fd3bb3 100644
--- a/trc/dmri_spline.cxx
+++ b/trc/dmri_spline.cxx
@@ -83,8 +83,7 @@ Timer cputimer;
 int main(int argc, char **argv) {
   int nargs, cputime;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_spline");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_train.cxx b/trc/dmri_train.cxx
index a989b30248c..ef995809890 100644
--- a/trc/dmri_train.cxx
+++ b/trc/dmri_train.cxx
@@ -89,8 +89,7 @@ int main(int argc, char **argv) {
   int nargs, cputime;
   char excfile[PATH_MAX], fbase[PATH_MAX];
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_train");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_trk2trk.cxx b/trc/dmri_trk2trk.cxx
index 360910a1b14..043aa039d96 100644
--- a/trc/dmri_trk2trk.cxx
+++ b/trc/dmri_trk2trk.cxx
@@ -101,8 +101,7 @@ int main(int argc, char **argv) {
   NonlinReg nonlinreg;
 #endif
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_trk2trk");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/trc/dmri_vox2vox.cxx b/trc/dmri_vox2vox.cxx
index 9ae26f82364..2cdbea01e20 100644
--- a/trc/dmri_vox2vox.cxx
+++ b/trc/dmri_vox2vox.cxx
@@ -91,8 +91,7 @@ int main(int argc, char **argv) {
   NonlinReg nonlinreg;
 #endif
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, vcid, "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "dmri_vox2vox");
   if (nargs && argc - nargs == 1) exit (0);
   argc -= nargs;
   cmdline = argv2cmdline(argc,argv);
diff --git a/tridec/tridec.cpp b/tridec/tridec.cpp
index 693975fcdf7..6ffa2c2a6d0 100644
--- a/tridec/tridec.cpp
+++ b/tridec/tridec.cpp
@@ -43,8 +43,7 @@ main(int argc,char *argv[]) {
   int i;
   int nargs;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: tridec.c,v 1.7 2011/03/02 00:04:41 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "tridec");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index a876f763538..d4f15bf59ae 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -3,7 +3,12 @@ project(utils)
 # ATH: temporarily turning off this warning in mrisurf_defect.cpp
 add_compile_options(-Wno-for-loop-analysis)
 
+# configure cmake version macros
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include)
+configure_file(version_info.h.in version_info.h)
+
 include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/packages/jpeg
   ${CMAKE_SOURCE_DIR}/packages/tiff
diff --git a/utils/argparse.cpp b/utils/argparse.cpp
index 00aaa7cfbc6..8183feae998 100644
--- a/utils/argparse.cpp
+++ b/utils/argparse.cpp
@@ -4,6 +4,7 @@
 #include <algorithm>
 
 #include "argparse.h"
+#include "version.h"
 #include "utils.h"
 
 
@@ -182,17 +183,18 @@ void ArgumentParser::addHelp(const unsigned char *text, unsigned int size)
 }
 
 
-/// Parses the command line from the standard main() function arguments
-void ArgumentParser::parse(size_t argc, const char** argv)
-{
-  parse(StringVector(argv, argv + argc));
-}
-
-
 /// The main parsing routine. This will error out if the command line input
 /// does not match the argument configuration
-void ArgumentParser::parse(const ArgumentParser::StringVector& argv)
+void ArgumentParser::parse(size_t ac, char** av)
 {
+  // TODO progname should be an optionally-set member variable, but extracting from argv for now
+  std::string progname;
+  std::stringstream progss(av[0]);
+  while (std::getline(progss, progname, '/'));  // do nothing in loop, just get basename
+
+  // create argv vector
+  StringVector argv = StringVector(av, av + ac);
+
   // name the app
   if (!argv.empty()) app_name = argv[0];
 
@@ -301,6 +303,19 @@ void ArgumentParser::parse(const ArgumentParser::StringVector& argv)
   }
   // validate the final argument
   if (active.valid) active.validate();
+  
+  // check if the default --version or --all-info flags were provided
+  int numInfoFlags = 0;
+  if (exists("version"))  {
+    std::cout << progname << " freesurfer " << getVersion() << std::endl;
+    numInfoFlags += 1;
+  }
+  if (exists("all-info")) {
+    std::cout << getAllInfo(ac, av, progname) << std::endl;
+    numInfoFlags += 1;
+  }
+  // exit cleanly if only --version or --all-info commands were used
+  if ((numInfoFlags > 0) && (ac - numInfoFlags) == 1) exit(0);
 
   // check for the help flag
   if ((helptextsize > 0) && (exists("help"))) {
diff --git a/utils/mriio.cpp b/utils/mriio.cpp
index 452cae73eba..b2c3ec58995 100644
--- a/utils/mriio.cpp
+++ b/utils/mriio.cpp
@@ -13978,16 +13978,15 @@ MRI *MRIremoveNaNs(MRI *mri_src, MRI * mri_dst)
   return (mri_dst);
 }
 
-int MRIaddCommandLine(MRI *mri, char *cmdline)
+int MRIaddCommandLine(MRI *mri, const std::string& cmdline)
 {
-  int i;
   if (mri->ncmds >= MAX_CMDS)
-    ErrorExit(ERROR_NOMEMORY, "MRIaddCommandLine: can't add cmd %s (%d)", cmdline, mri->ncmds);
+    fs::error() << "can't add cmd to mri since max cmds (" << mri->ncmds <<  ") has been reached";
 
-  i = mri->ncmds++;
-  mri->cmdlines[i] = (char *)calloc(strlen(cmdline) + 1, sizeof(char));
-  strcpy(mri->cmdlines[i], cmdline);
-  return (NO_ERROR);
+  int i = mri->ncmds++;
+  mri->cmdlines[i] = (char *)calloc(cmdline.size() + 1, sizeof(char));
+  strcpy(mri->cmdlines[i], cmdline.c_str());
+  return NO_ERROR;
 }
 
 /*------------------------------------------------------------------
diff --git a/utils/mrisurf.cpp b/utils/mrisurf.cpp
index b3b92ed214b..5ff29de0413 100644
--- a/utils/mrisurf.cpp
+++ b/utils/mrisurf.cpp
@@ -107,16 +107,15 @@ int MRISSfree(SMALL_SURFACE **pmriss)
   return (NO_ERROR);
 }
 
-int MRISaddCommandLine(MRI_SURFACE *mris, char *cmdline)
+int MRISaddCommandLine(MRI_SURFACE *mris, const std::string& cmdline)
 {
-  int i;
   if (mris->ncmds >= MAX_CMDS)
-    ErrorExit(ERROR_NOMEMORY, "MRISaddCommandLine: can't add cmd %s (%d)", cmdline, mris->ncmds);
+    fs::error() << "can't add cmd to surface since max cmds (" << mris->ncmds <<  ") has been reached";
 
-  i = mris->ncmds++;
-  mris->cmdlines[i] = (char *)calloc(strlen(cmdline) + 1, sizeof(char));
-  strcpy(mris->cmdlines[i], cmdline);
-  return (NO_ERROR);
+  int i = mris->ncmds++;
+  mris->cmdlines[i] = (char *)calloc(cmdline.size() + 1, sizeof(char));
+  strcpy(mris->cmdlines[i], cmdline.c_str());
+  return NO_ERROR;
 }
 
 // Support for writing traces that can be compared across test runs to help find where differences got introduced  
diff --git a/utils/test/mri_apply_EM_mask.c b/utils/test/mri_apply_EM_mask.c
index d0c5b1771b5..fa978bc62ac 100644
--- a/utils/test/mri_apply_EM_mask.c
+++ b/utils/test/mri_apply_EM_mask.c
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_apply_EM_mask.c,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_apply_EM_mask");
   argc -= nargs ;
 
   ac = argc ;
diff --git a/utils/test/mri_apply_INU.c b/utils/test/mri_apply_INU.c
index 543df9370ea..a3795df326c 100644
--- a/utils/test/mri_apply_INU.c
+++ b/utils/test/mri_apply_INU.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_apply_INU.c,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_apply_INU");
   argc -= nargs ;
 
   ac = argc ;
diff --git a/utils/test/mri_compute_all_CNR.c b/utils/test/mri_compute_all_CNR.c
index db384adba94..c898655c262 100644
--- a/utils/test/mri_compute_all_CNR.c
+++ b/utils/test/mri_compute_all_CNR.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_compute_all_CNR.c,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_all_CNR");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs ;
diff --git a/utils/test/mri_compute_stats.c b/utils/test/mri_compute_stats.c
index abdc3555327..79ea6692157 100644
--- a/utils/test/mri_compute_stats.c
+++ b/utils/test/mri_compute_stats.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_compute_stats.c,v 1.5 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_compute_stats");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs ;
diff --git a/utils/test/mri_concatenate_lta.c b/utils/test/mri_concatenate_lta.c
index 47a11d388d9..5e62be8d10a 100644
--- a/utils/test/mri_concatenate_lta.c
+++ b/utils/test/mri_concatenate_lta.c
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_concatenate_lta.c,v 1.6 2016/02/27 20:38:29 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_concatenate_lta");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs ;
diff --git a/utils/test/mri_edit_wm.c b/utils/test/mri_edit_wm.c
index 603c45ba7d6..8629f862aba 100644
--- a/utils/test/mri_edit_wm.c
+++ b/utils/test/mri_edit_wm.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_edit_wm.c,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_edit_wm");
   argc -= nargs ;
   if (1 == argc)
     exit (0);
diff --git a/utils/test/mri_extract.c b/utils/test/mri_extract.c
index 138fc50a4b0..3b5323993aa 100644
--- a/utils/test/mri_extract.c
+++ b/utils/test/mri_extract.c
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_extract.c,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_extract");
   argc -= nargs ;
 
   ac = argc ;
diff --git a/utils/test/mri_fslmat_to_lta.c b/utils/test/mri_fslmat_to_lta.c
index f087bc74872..1c3d4c95665 100644
--- a/utils/test/mri_fslmat_to_lta.c
+++ b/utils/test/mri_fslmat_to_lta.c
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: mri_fslmat_to_lta.c,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_fslmat_to_lta");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs ;
diff --git a/utils/test/mri_ms_LDA.c b/utils/test/mri_ms_LDA.c
index 7215a5c5abf..5fd51b52fcc 100644
--- a/utils/test/mri_ms_LDA.c
+++ b/utils/test/mri_ms_LDA.c
@@ -144,10 +144,7 @@ main(int argc, char *argv[])
   double sum_white, sum_gray;
   int count_white, count_gray;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option
-          (argc, argv,
-           "$Id: mri_ms_LDA.c,v 1.11 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ms_LDA");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/mri_ms_compute_CNR.c b/utils/test/mri_ms_compute_CNR.c
index 7efa7331d1c..7b473d885d0 100644
--- a/utils/test/mri_ms_compute_CNR.c
+++ b/utils/test/mri_ms_compute_CNR.c
@@ -165,8 +165,7 @@ main(int argc, char *argv[])
   double cnr;
 
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_ms_compute_CNR.c,v 1.10 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ms_compute_CNR");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/mri_ms_gca_EM.c b/utils/test/mri_ms_gca_EM.c
index 52a6d0de7dc..4abfeb92177 100644
--- a/utils/test/mri_ms_gca_EM.c
+++ b/utils/test/mri_ms_gca_EM.c
@@ -182,8 +182,7 @@ main(int argc, char *argv[])
   int MLE_label;
   double max_prior;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_ms_gca_EM.c,v 1.9 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_ms_gca_EM");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/mri_remove.cpp b/utils/test/mri_remove.cpp
index 77f149ee79c..af0a1bdae58 100644
--- a/utils/test/mri_remove.cpp
+++ b/utils/test/mri_remove.cpp
@@ -67,8 +67,7 @@ int main(int argc, char *argv[])
     return -1;
   }
   int nargs;
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_remove.cpp,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_remove");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/mri_transform_to_COR.c b/utils/test/mri_transform_to_COR.c
index 4f431361151..0b73ff538d4 100644
--- a/utils/test/mri_transform_to_COR.c
+++ b/utils/test/mri_transform_to_COR.c
@@ -122,8 +122,7 @@ main(int argc, char *argv[])
   double maxV, minV, value;
   //  MATRIX *i_to_r, *r_to_i;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mri_transform_to_COR.c,v 1.9 2016/02/27 20:38:29 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mri_transform_to_COR");
   if (nargs && argc - nargs == 1)
     usage_exit (0);
   argc -= nargs;
diff --git a/utils/test/mris_compute_thickness.cpp b/utils/test/mris_compute_thickness.cpp
index 2f104bea8d3..b907f232413 100644
--- a/utils/test/mris_compute_thickness.cpp
+++ b/utils/test/mris_compute_thickness.cpp
@@ -116,8 +116,7 @@ int main(int argc, char *argv[])
   VERTEX *vertex;
   FACE *face;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_compute_thickness.cpp,v 1.5 2016/02/27 20:38:29 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_compute_thickness");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/mris_diff.cpp b/utils/test/mris_diff.cpp
index e2adf7949b8..ab603f98d8f 100644
--- a/utils/test/mris_diff.cpp
+++ b/utils/test/mris_diff.cpp
@@ -177,8 +177,7 @@ int main(int argc, char *argv[])
   label = 0;
   annotation = 0;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_diff.cpp,v 1.11 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_diff");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/mris_diff_on_surface.c b/utils/test/mris_diff_on_surface.c
index a869f91d461..e6e645355e2 100644
--- a/utils/test/mris_diff_on_surface.c
+++ b/utils/test/mris_diff_on_surface.c
@@ -86,8 +86,7 @@ int main(int argc, char *argv[])
 
   MRI_SURFACE *BaseSurf;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_diff_on_surface.c,v 1.3 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_diff_on_surface");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/mris_indirect_morph.cpp b/utils/test/mris_indirect_morph.cpp
index 3251e49196b..cc0503ba6f1 100644
--- a/utils/test/mris_indirect_morph.cpp
+++ b/utils/test/mris_indirect_morph.cpp
@@ -130,8 +130,7 @@ int main(int argc, char *argv[])
   LTA          *lta = 0;
   int          transform_type;
 
-  /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: mris_indirect_morph.cpp,v 1.7 2011/03/02 00:04:55 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "mris_indirect_morph");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
diff --git a/utils/test/tiff_write_image.c b/utils/test/tiff_write_image.c
index 7ac16e0704a..ad584e70541 100644
--- a/utils/test/tiff_write_image.c
+++ b/utils/test/tiff_write_image.c
@@ -58,7 +58,7 @@ int main ( int argc, char** argv )
 
   Progname = argv[0];
 
-  nargs = handle_version_option (argc, argv, "$Id: tiff_write_image.c,v 1.2 2011/03/02 00:04:56 nicks Exp $", "$Name:  $");
+  nargs = handleVersionOption(argc, argv, "tiff_write_image");
   argc -= nargs ;
   if (1 == argc)
     exit (0);
diff --git a/utils/version.cpp b/utils/version.cpp
index 5fdb1c983cd..f42cb028343 100644
--- a/utils/version.cpp
+++ b/utils/version.cpp
@@ -1,32 +1,3 @@
-/**
- * @file  version.c
- * @brief freesurfer version functions defined here
- *
- * Looks for the --version, -version, --all-info, or -all-info tag in the
- * argv and if found, prints out version information, namely this:
- * ProgramVersion, TimeStamp, CVS, User, Machine, Platform, PlatformVersion
- * CompilerName, and CompilerVersion.
- */
-/*
- * Original Author: Kevin Teich
- * Revision Info:
- *    $Author: nicks $
- *    $Date: 2011/03/02 00:04:55 $
- *    $Revision: 8c0544cb51c408c315be1f6cae68f38fc534b7da $
- *
- * Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
- *
- * Terms and conditions for use, reproduction, distribution and contribution
- * are found in the 'FreeSurfer Software License Agreement' contained
- * in the file 'LICENSE' found in the FreeSurfer distribution, and here:
- *
- * https://surfer.nmr.mgh.harvard.edu/fswiki/FreeSurferSoftwareLicense
- *
- * Reporting: freesurfer@nmr.mgh.harvard.edu
- *
- */
-
-#include "version.h"
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,374 +7,69 @@
 #include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
+
+#include "version.h"
+#include "version_info.h"
 #include "const.h"
 #include "error.h"
 #include "utils.h"
 
-/* Set our compiler name */
-#if defined(__INTEL_COMPILER)
-#undef __GNUC__
-#define COMPILER_NAME "INTEL_COMPILER"
-#elif defined(__GNUC__)
-#define COMPILER_NAME "GCC"
-#else
-#define COMPILER_NAME "Non-GCC"
-#endif
 
-/* If GCC (probably is) get the version number */
-#if defined(__GNUC__)
-#if defined(__GNU_PATCHLEVEL__)
-#define COMPILER_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#else
-#define COMPILER_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100)
-#endif
-#else
-#define COMPILER_VERSION 0
-#endif
-
-/* Figure out the platform. */
+// set the platform
 #if defined(Linux) || defined(linux) || defined(__linux)
-#define PLATFORM "Linux"
+  #define PLATFORM "Linux"
 #endif
 #if defined(Darwin) || defined(__MACOSX__) || defined(__APPLE__)
-#define PLATFORM "Darwin"
+  #define PLATFORM "Darwin"
 #endif
 #if defined(IRIX) || defined(sgi) || defined(mips) || defined(_SGI_SOURCE)
-#define PLATFORM "IRIX"
+  #define PLATFORM "IRIX"
 #endif
 #if defined(sun) || defined(__sun)
-#if defined(__SVR4) || defined(__svr4__)
-#define PLATFORM "Solaris"
-#else
-#define PLATFORM "SunOS"
-#endif
+  #if defined(__SVR4) || defined(__svr4__)
+    #define PLATFORM "Solaris"
+  #else
+    #define PLATFORM "SunOS"
+  #endif
 #endif
 #if defined(Windows_NT)
-#define PLATFORM "Windows"
+  #define PLATFORM "Windows"
 #endif
-
 #ifndef PLATFORM
-#error "PLATFORM not defined!"
+  #error "PLATFORM not defined!"
 #endif
 
-/* This function looks for the --version, or -version tag in the
-   argv and if found, prints out version information. This can be used
-   in any binary. It will return the number of options processed and
-   copy the remaining items in argv back, so the caller can shorten
-   their own argc variable, like this:
-
-   nargs = handle_version_option (argc, argv, "dollarIDdollar");
-   argc -= nargs ;
-
-   (This is done so that it can easily be used with older programs
-   that make assumptions about argument counts instead of scanning for
-   options.)
-
-   It will print out the id string passed in, which should just be
-   dollar sign + ID + dollar sign, which CVS will expand to include
-   the CVS information including CVS file, revision number, date,
-   peson who checked it in, and tag, as well as the OS and GCC
-   information.
-
-   The binary may also want to exit if there are no other options to
-   handle, i.e.
-
-   nargs = handle_version_option (argc, argv, "dollarIDdollar");
-   if (nargs && argc - nargs == 1)
-   exit (0);
-   argc -= nargs;
-*/
-int make_cmd_version_string(
-    int argc, char **argv, const char *id_string, const char *version_string, char *return_string)
-{
-  int nnarg = 0;
-  char stripped_version_string[1024];
-  int length;
-  time_t seconds;
-  struct tm broken_time;
-  struct utsname kernel_info;
-  int result;
-  char *begin;
-  char program_name[1024];
-  char arguments[1024];
-  char current_time_stamp[1024];
-  char user[1024];
-  char machine[1024];
-  char platform_version[1024];
-  struct passwd *pw;
-
-  if (strlen(version_string) > 7) {
-    strcpy(stripped_version_string, &(version_string[7]));
-    length = strlen(stripped_version_string);
-    if (length > 2) {
-      stripped_version_string[length - 2] = '\0';
-    }
-  }
-  else {
-    strcpy(stripped_version_string, version_string);
-  }
-
-  begin = argv[0];
-  strcpy(program_name, begin);
-
-  /* Copy the arguments to the arguments string. */
-  strcpy(arguments, "");
-  if (argc > 1) {
-    strncpy(arguments, argv[1], 1023);
-    for (nnarg = 2; nnarg < argc; nnarg++) {
-      // on Slackware Linux, libc does not support having the same source and
-      // destination, like this:
-      // sprintf (arguments, "%s %s", arguments, argv[nnarg]);
-      // the correct way to do this is:
-      strcat(arguments, " ");
-      if (strlen(arguments) + strlen(argv[nnarg]) >= 1023) break;
-      strcat(arguments, argv[nnarg]);
-    }
-  }
-
-  /* Find the time string. */
-  seconds = time(NULL);
-  gmtime_r(&seconds, &broken_time);
-  sprintf(current_time_stamp,
-          "20%02d/%02d/%02d-%02d:%02d:%02d-GMT",
-          broken_time.tm_year % 100, /* mod here to change 103 to 03 */
-          broken_time.tm_mon + 1,    /* +1 here because tm_mon is 0-11 */
-          broken_time.tm_mday,
-          broken_time.tm_hour,
-          broken_time.tm_min,
-          broken_time.tm_sec);
-
-  /* As suggested by the getlogin() manpage, use getpwuid(geteuid())
-     to get the user controlling this process. don't use getlogin()
-     as that returns the name of the user logged in on the controlling
-     terminal of the process (ie the person sitting at the terminal),
-     and don't use cuserid() because the manpage says not to.
-  */
-  pw = getpwuid(geteuid());
-  if ((pw != NULL) && (pw->pw_name != NULL))
-    strcpy(user, pw->pw_name);
-  else
-    strcpy(user, "UNKNOWN");
-
-  /* Call uname to get the machine. */
-  result = uname(&kernel_info);
-  if (0 != result) {
-    // fprintf (stderr, "uname() returned %d\n", result);
-    strcpy(machine, "UNKNOWN");
-    strcpy(platform_version, "UNKNOWN");
-  }
-  else {
-    strcpy(machine, kernel_info.nodename);
-    strcpy(platform_version, kernel_info.release);
-  }
-
-  // TODO: build_timestamp really ought to be passed-in as a parameter
-  // from the calling binary, to get a more accurate build time, but for
-  // now, the build time of this version.c (libutils) is better than nothing
-  char build_timestamp[] = __DATE__ " " __TIME__;
-  char argstr[CMD_LINE_LEN];
+// set the compiler name
+#if defined(__INTEL_COMPILER)
+  #undef __GNUC__
+  #define COMPILER_NAME "Intel"
+#elif defined(__clang__)
+  #define COMPILER_NAME "Clang"
+#elif defined(__GNUC__)
+  #define COMPILER_NAME "GCC"
+#else
+  #define COMPILER_NAME "Unknown"
+#endif
 
-  if (strlen(arguments) > CMD_LINE_LEN / 2)
-    strncpy(argstr, arguments, CMD_LINE_LEN / 2);
-  else
-    strcpy(argstr, arguments);
-
-  /* Build the info string. */
-  sprintf(return_string,
-          "%s %s "
-          "ProgramVersion: %s  TimeStamp: %s  "
-          "BuildTimeStamp: %s  Id: %s  User: %s  "
-          "Machine: %s  Platform: %s  PlatformVersion: %s  "
-          "CompilerName: %s  CompilerVersion: %d  ",
-          program_name,
-          argstr,
-          version_string,
-          current_time_stamp,
-          build_timestamp,
-          id_string,
-          user,
-          machine,
-          PLATFORM,
-          platform_version,
-          COMPILER_NAME,
-          COMPILER_VERSION);
-
-  return (NO_ERROR);
+static std::string ver_string(int a, int b, int c) {
+  std::ostringstream ss;
+  ss << a << '.' << b << '.' << c;
+  return ss.str();
 }
 
-int handle_version_option(int argc, char **argv, const char *id_string, const char *version_string)
-{
-  int narg = 0;
-  int nnarg = 0;
-  int num_processed_args = 0;
-  char stripped_version_string[1024];
-  int length;
-  char *option = NULL;
-  time_t seconds;
-  struct tm broken_time;
-  struct utsname kernel_info;
-  int result;
-  char *begin;
-  char program_name[1024];
-  char arguments[1024];
-  char current_time_stamp[1024];
-  char user[1024];
-  char machine[1024];
-  char platform_version[1024];
-  struct passwd *pw;
-  char *myarg;
-
-  /* Go through each option looking for --version, -version,
-     --all-info, or -all-info */
-  for (narg = 1; narg < argc; narg++) {
-    option = argv[narg];
-
-    if (!strncmp(option, "--version", 9) || !strncmp(option, "-version", 8)) {
-#if 0
-      /* Since BIRN is now using --all-info to get version stuff,
-         I want to keep this as simple as possible. So I'm
-         commenting out some of this stuff, let's see if anybody
-         complains. */
-
-      /* Print out the entire command line. */
-      for (nnarg = 0; nnarg < argc; nnarg++)
-        fprintf (stdout, "%s ", argv[nnarg]);
-      fprintf (stdout, "\n");
-
-      fprintf (stdout, "%s Platform: %s C lib: %d\n",
-               id_string, PLATFORM, COMPILER_VERSION);
+// set the compiler version
+#if defined(__clang__)
+  #define COMPILER_VERSION ver_string(__clang_major__, __clang_minor__, __clang_patchlevel__)
+#elif defined(__GNUC__)
+  #if defined(__GNU_PATCHLEVEL__)
+    #define COMPILER_VERSION ver_string(__GNUC__, __GNUC_MINOR__)
+  #else
+    #define COMPILER_VERSION ver_string(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+  #endif
 #else
-      /* Strip the "{Name: " and "}" from the id string. */
-      if (strlen(version_string) > 7) {
-        strcpy(stripped_version_string, &(version_string[7]));
-        length = strlen(stripped_version_string);
-        if (length > 2) {
-          stripped_version_string[length - 2] = '\0';
-        }
-      }
-      else {
-        strcpy(stripped_version_string, version_string);
-      }
-
-      if (strcmp(" $", stripped_version_string) == 0) {
-        // on the dev build, where a sticky tag does not exist,
-        // just a dollar sign is printed, which isnt very helpful,
-        // so print something...
-        strcpy(stripped_version_string, "dev build (use --all-info flag for full version info)");
-      }
-      fprintf(stdout, "%s\n", stripped_version_string);
-
+  #define COMPILER_VERSION 0
 #endif
-      num_processed_args++;
-
-      /* Copy later args one step back. */
-      for (nnarg = narg; nnarg < argc - num_processed_args; nnarg++) {
-        myarg = (char *)malloc(strlen(argv[nnarg + 1]) + 1);
-        strcpy(myarg, argv[nnarg + 1]);
-        argv[nnarg] = myarg;
-      }
-    }
 
-    if (!strncmp(option, "--all-info", 11) || !strncmp(option, "-all-info", 10)) {
-      /* Copy argv[0] without the path into program_name. */
-      begin = strrchr(argv[0], (int)'/');
-      if (NULL == begin) {
-        begin = argv[0];
-      }
-      else {
-        begin = begin + 1;
-      }
-      strcpy(program_name, begin);
-
-      /* Copy the arguments to the arguments string. */
-      strcpy(arguments, "");
-      if (argc > 1) {
-        strcpy(arguments, argv[1]);
-        for (nnarg = 2; nnarg < argc; nnarg++) {
-          // on Slackware Linux, libc does not support having the same
-          // source and destination, like this:
-          // sprintf (arguments, "%s %s", arguments, argv[nnarg]);
-          // the correct way to do this is:
-          strcat(arguments, " ");
-          strcat(arguments, argv[nnarg]);
-        }
-      }
-
-      /* Find the time string. */
-      seconds = time(NULL);
-      gmtime_r(&seconds, &broken_time);
-      sprintf(current_time_stamp,
-              "20%02d/%02d/%02d-%02d:%02d:%02d-GMT",
-              broken_time.tm_year % 100, /* mod here to change 103 to 03 */
-              broken_time.tm_mon + 1,    /* +1 here because tm_mon is 0-11 */
-              broken_time.tm_mday,
-              broken_time.tm_hour,
-              broken_time.tm_min,
-              broken_time.tm_sec);
-
-      /* As suggested by the getlogin() manpage, use getpwuid(geteuid())
-         to get the user controlling this process. don't use getlogin()
-         as that returns the name of the user logged in on the controlling
-         terminal of the process (ie the person sitting at the terminal),
-         and don't use cuserid() because the manpage says not to.
-      */
-      pw = getpwuid(geteuid());
-      if ((pw != NULL) && (pw->pw_name != NULL))
-        strcpy(user, pw->pw_name);
-      else
-        strcpy(user, "UNKNOWN");
-
-      /* Call uname to get the machine. */
-      result = uname(&kernel_info);
-      if (0 != result) {
-        // fprintf (stderr, "uname() returned %d\n", result);
-        strcpy(machine, "UNKNOWN");
-        strcpy(platform_version, "UNKNOWN");
-      }
-      else {
-        strcpy(machine, kernel_info.nodename);
-        strcpy(platform_version, kernel_info.release);
-      }
-
-      // TODO: build_timestamp really ought to be passed-in as a parameter
-      // from the calling binary, to get a more accurate build time, but for
-      // now, the build time of version.c (libutils) is better than nothing
-      char build_timestamp[] = __DATE__ " " __TIME__;
-
-      /* Build the info string. */
-      fprintf(stdout,
-              "ProgramName: %s  ProgramArguments: %s  "
-              "ProgramVersion: %s  TimeStamp: %s  "
-              "BuildTimeStamp: %s  Id: %s  User: %s  "
-              "Machine: %s  Platform: %s  PlatformVersion: %s  "
-              "CompilerName: %s  CompilerVersion: %d \n",
-              program_name,
-              arguments,
-              version_string,
-              current_time_stamp,
-              build_timestamp,
-              id_string,
-              user,
-              machine,
-              PLATFORM,
-              platform_version,
-              COMPILER_NAME,
-              COMPILER_VERSION);
-
-      num_processed_args++;
-
-      /* Copy later args one step back. */
-      for (nnarg = narg; nnarg < argc - num_processed_args; nnarg++) {
-        myarg = (char *)malloc(strlen(argv[nnarg + 1]) + 1);
-        strcpy(myarg, argv[nnarg + 1]);
-        argv[nnarg] = myarg;
-      }
-    }
-  }
-
-  /* Return the number of arguments processed. */
-  return num_processed_args;
-}
 
 /*------------------------------------------------------------------------
   argv2cmdline() - converts argv into a single string.
@@ -501,3 +167,146 @@ char *VERcurTimeStamp(void)
   current_time_stamp = strcpyalloc(tmpstr);
   return (current_time_stamp);
 }
+
+
+
+/*
+  Returns the freesurfer version string.
+*/
+std::string getVersion()
+{
+  return FS_VERSION;
+}
+
+
+/*
+  Returns the freesurfer build stamp ID.
+*/
+std::string getBuildStamp()
+{
+  return FS_BUILD_STAMP;
+}
+
+
+/*
+  This function looks for the --version, or -version tag in the
+  argv and if found, prints out version information. This can be used
+  in any binary. It will return the number of options processed and
+  copy the remaining items in argv back, so the caller can shorten
+  their own argc variable, like this:
+
+  nargs = handleVersionOption(argc, argv, "dollarIDdollar");
+  argc -= nargs;
+
+  (This is done so that it can easily be used with older programs
+  that make assumptions about argument counts instead of scanning for
+  options.)
+
+  It will print out the id string passed in, which should just be
+  dollar sign + ID + dollar sign, which CVS will expand to include
+  the CVS information including CVS file, revision number, date,
+  peson who checked it in, and tag, as well as the OS and GCC
+  information.
+
+  The binary may also want to exit if there are no other options to
+  handle, i.e.
+
+  nargs = handleVersionOption(argc, argv, "dollarIDdollar");
+  if (nargs && argc - nargs == 1) exit (0);
+  argc -= nargs;
+*/
+int handleVersionOption(int argc, char **argv, const char *progname)
+{
+  char *myarg;
+  int num_processed_args = 0;
+
+  for (int narg = 1; narg < argc; narg++) {
+    char *option = argv[narg];
+
+    if (!strncmp(option, "--version", 9) || !strncmp(option, "-version", 8)) {
+      std::cout << progname << " freesurfer " << FS_VERSION << std::endl;
+    }
+    else if (!strncmp(option, "--all-info", 11) || !strncmp(option, "-all-info", 10)) {
+      std::cout << getAllInfo(argc, argv, progname) << std::endl;
+    }
+    else {
+      continue;
+    }
+
+    // copy later args one step back if processed the flag
+    num_processed_args++;
+    for (int nnarg = narg; nnarg < argc - num_processed_args; nnarg++) {
+      myarg = (char *)malloc(strlen(argv[nnarg + 1]) + 1);
+      strcpy(myarg, argv[nnarg + 1]);
+      argv[nnarg] = myarg;
+    }
+  }
+
+  // return the number of arguments processed
+  return num_processed_args;
+}
+
+
+std::string getAllInfo(int argc, char **argv, const std::string& progname)
+{
+  // get current time
+  char current_time_stamp[1024];
+  struct tm broken_time;
+  time_t seconds = time(NULL);
+  gmtime_r(&seconds, &broken_time);
+  sprintf(current_time_stamp,
+    "20%02d/%02d/%02d-%02d:%02d:%02d-GMT",
+    broken_time.tm_year % 100,
+    broken_time.tm_mon + 1,
+    broken_time.tm_mday,
+    broken_time.tm_hour,
+    broken_time.tm_min,
+    broken_time.tm_sec);
+
+  // TODO this timestamp really ought to be passed-in as a parameter
+  // from the calling binary, to get a more accurate build time, but for
+  // now, the build time of libutils is better than nothing
+  char build_time[] = __DATE__ " " __TIME__;
+
+  // get username
+  char username[1024];
+  struct passwd *pw = getpwuid(geteuid());
+  if ((pw != NULL) && (pw->pw_name != NULL)) {
+    strcpy(username, pw->pw_name);
+  } else {
+    strcpy(username, "UNKNOWN");
+  }
+
+  // get current machine name and platform version
+  char machine[1024];
+  char platform_version[1024];
+  struct utsname kernel_info;
+  if (uname(&kernel_info) != 0) {
+    strcpy(machine, "UNKNOWN");
+    strcpy(platform_version, "UNKNOWN");
+  } else {
+    strcpy(machine, kernel_info.nodename);
+    strcpy(platform_version, kernel_info.release);
+  }
+
+  // get args as string
+  std::ostringstream argvss;
+  argvss << argv[0];
+  for (int i = 1; i < argc ; i++) argvss << " " << argv[i];
+
+  std::ostringstream infoss;
+  infoss << "ProgramName: " << progname
+         << "  ProgramArguments: " << argvss.str()
+         << "  ProgramVersion: " << getVersion()
+         << "  TimeStamp: " << current_time_stamp
+         << "  BuildTime: " << build_time
+         << "  BuildStamp: " << getBuildStamp()
+         << "  User: " << username
+         << "  Machine: " << machine
+         << "  Platform: " << PLATFORM
+         << "  PlatformVersion: " << platform_version
+         << "  CompilerName: " << COMPILER_NAME
+         << "  CompilerVersion: " << COMPILER_VERSION;
+
+  return infoss.str();
+}
diff --git a/utils/version_info.h.in b/utils/version_info.h.in
new file mode 100644
index 00000000000..f2fa0560297
--- /dev/null
+++ b/utils/version_info.h.in
@@ -0,0 +1,5 @@
+#pragma once
+
+// cmake-configured macros
+#define FS_VERSION "${FS_VERSION}"
+#define FS_BUILD_STAMP "${BUILD_STAMP}"