Merge branch '21-misc-cleanup' into 22
Merge branch '21-misc-cleanup' into 22
Merge branch '21-misc-cleanup' into 22
implement VARIANT_ONE_NAMED in $ and .C/.Fortran
Merge branch '22-var-dotcode' into 23