diff --git a/build/appveyor/CYGW-appveyor-build.bat b/build/appveyor/CYGW-appveyor-build.bat
index 7f33287..7749176 100644
--- a/build/appveyor/CYGW-appveyor-build.bat
+++ b/build/appveyor/CYGW-appveyor-build.bat
@@ -15,9 +15,9 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor                           || EXIT /B
-CALL cl_banner_build.bat                    || EXIT /B
-CALL cl_setenv.bat                          || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_build.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
 
 SET CMAKEARGS=^
   -G'%GENERATOR%' ^
diff --git a/build/appveyor/CYGW-appveyor-install.bat b/build/appveyor/CYGW-appveyor-install.bat
index 4cdc8ea..5ef4aba 100644
--- a/build/appveyor/CYGW-appveyor-install.bat
+++ b/build/appveyor/CYGW-appveyor-install.bat
@@ -20,10 +20,10 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor                          || EXIT /B
-CALL cl_banner_install.bat                 || EXIT /B
-CALL cl_setenv.bat                         || EXIT /B
-CALL cl_showenv.bat                        || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_install.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
+CALL cl_showenv.bat || EXIT /B
 
 ::
 :: Upgrades cygwin to the latest, if you want...
@@ -37,14 +37,4 @@
 
 %BASH% -lc "wget rawgit.com/transcode-open/apt-cyg/master/apt-cyg && install apt-cyg /bin && rm -f apt-cyg" || EXIT /B
 %BASH% -lc "apt-cyg update" || EXIT /B
-%BASH% -lc "apt-cyg install bison cmake flex gcc-g++ libboost-devel libevent-devel make openssl-devel xz zlib-devel"
-
-::
-:: We need a newer version of cmake, the one cygwin provides is too old
-:: to recognize the version of boost.  Luckily there is a pre-release
-:: one available, however cygwin's own setup program has no command line
-:: option to allow access to test packages!
-::
-
-%BASH% -lc "apt-cyg remove cmake"
-%BASH% -lc "cd / && wget http://mirror.clarkson.edu/cygwin/x86_64/release/cmake/cmake-3.20.0-1.tar.xz && tar xJf cmake-3.20.0-1.tar.xz && hash -r && cmake --version"
+%BASH% -lc "apt-cyg install bison cmake flex gcc-g++ libboost-devel libevent-devel make openssl-devel xz zlib-devel" || EXIT /B
diff --git a/build/appveyor/CYGW-appveyor-test.bat b/build/appveyor/CYGW-appveyor-test.bat
index b667f9b..5b0d0d2 100644
--- a/build/appveyor/CYGW-appveyor-test.bat
+++ b/build/appveyor/CYGW-appveyor-test.bat
@@ -14,8 +14,8 @@
 
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
-CD build\appveyor              || EXIT /B
-CALL cl_banner_test.bat        || EXIT /B
-CALL cl_setenv.bat             || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_test.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
 
 %BASH% -lc "cd %BUILDDIR% && ctest.exe -C %CONFIGURATION% --timeout 300 -VV -E '%DISABLED_TESTS%'" || EXIT /B
diff --git a/build/appveyor/MING-appveyor-build.bat b/build/appveyor/MING-appveyor-build.bat
index eec65f8..3e24b11 100644
--- a/build/appveyor/MING-appveyor-build.bat
+++ b/build/appveyor/MING-appveyor-build.bat
@@ -15,9 +15,9 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor                           || EXIT /B
-CALL cl_banner_build.bat                    || EXIT /B
-CALL cl_setenv.bat                          || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_build.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
 
 SET CMAKEARGS=^
   -G'%GENERATOR%' ^
diff --git a/build/appveyor/MING-appveyor-test.bat b/build/appveyor/MING-appveyor-test.bat
index 499c1ff..ba69a11 100644
--- a/build/appveyor/MING-appveyor-test.bat
+++ b/build/appveyor/MING-appveyor-test.bat
@@ -15,8 +15,8 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor              || EXIT /B
-CALL cl_banner_test.bat        || EXIT /B
-CALL cl_setenv.bat             || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_test.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
 
 %BASH% -lc "cd %BUILDDIR% && ctest.exe -C %CONFIGURATION% --timeout 300 -VV -E '%DISABLED_TESTS%'" || EXIT /B
diff --git a/build/appveyor/MSVC-appveyor-build.bat b/build/appveyor/MSVC-appveyor-build.bat
index 3d2bbee..79c4b03 100644
--- a/build/appveyor/MSVC-appveyor-build.bat
+++ b/build/appveyor/MSVC-appveyor-build.bat
@@ -15,11 +15,11 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor                           || EXIT /B
-CALL cl_banner_build.bat                    || EXIT /B
-CALL cl_setenv.bat                          || EXIT /B
-MKDIR "%BUILDDIR%"                          || EXIT /B
-CD "%BUILDDIR%"                             || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_build.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
+MKDIR "%BUILDDIR%" || EXIT /B
+CD "%BUILDDIR%" || EXIT /B
 
 :: When libraries cannot be found, things might have been updated
 :: so uncomment this and submit a pull request to see what's there
@@ -51,9 +51,9 @@
     -DOPENSSL_USE_STATIC_LIBS=OFF ^
     -DZLIB_LIBRARY="%WIN3P%\zlib-inst\lib\zlib%ZLIB_LIB_SUFFIX%.lib" ^
     -DZLIB_ROOT="%WIN3P%\zlib-inst" ^
-    -DWITH_PYTHON=%WITH_PYTHON%             || EXIT /B
+    -DWITH_PYTHON=%WITH_PYTHON% || EXIT /B
 @ECHO OFF
 
 cmake --build . ^
   --config "%CONFIGURATION%" ^
-  --target INSTALL                          || EXIT /B
+  --target INSTALL || EXIT /B
diff --git a/build/appveyor/MSVC-appveyor-install.bat b/build/appveyor/MSVC-appveyor-install.bat
index a4c49fe..3b4cd8e 100644
--- a/build/appveyor/MSVC-appveyor-install.bat
+++ b/build/appveyor/MSVC-appveyor-install.bat
@@ -20,33 +20,33 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor                         || EXIT /B
-CALL cl_banner_install.bat                || EXIT /B
-CALL cl_setenv.bat                        || EXIT /B
-CALL cl_showenv.bat                       || EXIT /B
-MKDIR "%WIN3P%"                           || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_install.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
+CALL cl_showenv.bat || EXIT /B
+MKDIR "%WIN3P%" || EXIT /B
 
 choco feature enable -n allowGlobalConfirmation || EXIT /B
 
 :: Things to install when NOT running in appveyor:
 IF "%APPVEYOR_BUILD_ID%" == "" (
-    cup -y chocolatey                     || EXIT /B
-    cinst -y curl                         || EXIT /B
-    cinst -y 7zip                         || EXIT /B
-    cinst -y python3                      || EXIT /B
-    cinst -y openssl.light                || EXIT /B
+    cup -y chocolatey || EXIT /B
+    cinst -y curl || EXIT /B
+    cinst -y 7zip || EXIT /B
+    cinst -y python3 || EXIT /B
+    cinst -y openssl.light || EXIT /B
 )
 
-cinst -y jdk8                             || EXIT /B
-cinst -y winflexbison3                    || EXIT /B
+cinst -y jdk8 || EXIT /B
+cinst -y winflexbison3 || EXIT /B
 
 :: zlib - not available through chocolatey
-CD "%APPVEYOR_SCRIPTS%"                   || EXIT /B
-call build-zlib.bat                       || EXIT /B
+CD "%APPVEYOR_SCRIPTS%" || EXIT /B
+call build-zlib.bat || EXIT /B
 
 :: libevent - not available through chocolatey
-CD "%APPVEYOR_SCRIPTS%"                   || EXIT /B
-call build-libevent.bat                   || EXIT /B
+CD "%APPVEYOR_SCRIPTS%" || EXIT /B
+call build-libevent.bat || EXIT /B
 
 :: python packages (correct path to pip set in cl_setenv.bat)
 pip.exe ^
@@ -54,11 +54,11 @@
             ipaddress ^
             six ^
             tornado ^
-            twisted                       || EXIT /B
+            twisted || EXIT /B
 
 :: Adobe Flex SDK 4.6 for ActionScript
-MKDIR "C:\Adobe\Flex\SDK\4.6"             || EXIT /B
+MKDIR "C:\Adobe\Flex\SDK\4.6" || EXIT /B
 appveyor DownloadFile http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip -FileName C:\Adobe\Flex\SDK\4.6\SDK.zip || EXIT /B
-CD "C:\Adobe\Flex\SDK\4.6"                || EXIT /B
-7z x SDK.zip                              || EXIT /B
+CD "C:\Adobe\Flex\SDK\4.6" || EXIT /B
+7z x SDK.zip || EXIT /B
 SETX FLEX_HOME "C:\Adobe\Flex\SDK\4.6"
diff --git a/build/appveyor/MSVC-appveyor-test.bat b/build/appveyor/MSVC-appveyor-test.bat
index 3594579..a340f89 100644
--- a/build/appveyor/MSVC-appveyor-test.bat
+++ b/build/appveyor/MSVC-appveyor-test.bat
@@ -14,10 +14,10 @@
 
 @ECHO ON
 SETLOCAL EnableDelayedExpansion
-CD build\appveyor              || EXIT /B
-CALL cl_banner_test.bat        || EXIT /B
-CALL cl_setenv.bat             || EXIT /B
-CD "%BUILDDIR%"                || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_test.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
+CD "%BUILDDIR%" || EXIT /B
 
 DIR C:\libraries
 DIR C:\libraries\boost_1_59_0
diff --git a/build/appveyor/MSYS-appveyor-build.bat b/build/appveyor/MSYS-appveyor-build.bat
index 4401729..814a624 100644
--- a/build/appveyor/MSYS-appveyor-build.bat
+++ b/build/appveyor/MSYS-appveyor-build.bat
@@ -15,9 +15,9 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor                           || EXIT /B
-CALL cl_banner_build.bat                    || EXIT /B
-CALL cl_setenv.bat                          || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_build.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
 
 SET BASH=C:\msys64\usr\bin\bash
 SET CMAKE=/c/msys64/mingw64/bin/cmake.exe
diff --git a/build/appveyor/MSYS-appveyor-test.bat b/build/appveyor/MSYS-appveyor-test.bat
index 0f37ec5..45bb390 100644
--- a/build/appveyor/MSYS-appveyor-test.bat
+++ b/build/appveyor/MSYS-appveyor-test.bat
@@ -15,10 +15,10 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
 
-CD build\appveyor              || EXIT /B
-CALL cl_banner_test.bat        || EXIT /B
-CALL cl_setenv.bat             || EXIT /B
-CD "%BUILDDIR%"                || EXIT /B
+CD build\appveyor || EXIT /B
+CALL cl_banner_test.bat || EXIT /B
+CALL cl_setenv.bat || EXIT /B
+CD "%BUILDDIR%" || EXIT /B
 
 :: randomly fails on mingw; see Jira THRIFT-4106
 SET DISABLED_TESTS=concurrency_test
diff --git a/build/appveyor/build-libevent.bat b/build/appveyor/build-libevent.bat
index 64b635b..939daf5 100644
--- a/build/appveyor/build-libevent.bat
+++ b/build/appveyor/build-libevent.bat
@@ -18,20 +18,20 @@
 SET URL=https://github.com/libevent/libevent/releases/download/release-%LIBEVENT_VERSION%-stable/%URLFILE%
 
 :: Download - support running a local build or a build in appveyor
-CD "%WIN3P%"                                     || EXIT /B
+CD "%WIN3P%" || EXIT /B
 IF "%APPVEYOR_BUILD_ID%" == "" (
     curl -L -f -o "%URLFILE%" "%URL%"
 ) ELSE (
     appveyor DownloadFile "%URL%"
 )
-7z x "%URLFILE%" -so | 7z x -si -ttar > nul      || EXIT /B
-CD "libevent-%LIBEVENT_VERSION%-stable"          || EXIT /B
-nmake -f Makefile.nmake static_libs              || EXIT /B
+7z x "%URLFILE%" -so | 7z x -si -ttar > nul || EXIT /B
+CD "libevent-%LIBEVENT_VERSION%-stable" || EXIT /B
+nmake -f Makefile.nmake static_libs || EXIT /B
 
 :: in libevent 2.0 there is no nmake subdirectory in WIN32-Code, but in 2.1 there is
-mkdir lib                                        || EXIT /B
-move *.lib lib\                                  || EXIT /B
+mkdir lib || EXIT /B
+move *.lib lib\ || EXIT /B
 move WIN32-Code\event2\* include\event2\         || move WIN32-Code\nmake\event2\* include\event2\ || EXIT /B
-move *.h include\                                || EXIT /B
+move *.h include\ || EXIT /B
 
 ENDLOCAL
diff --git a/build/appveyor/build-zlib.bat b/build/appveyor/build-zlib.bat
index 9195726..367ef98 100644
--- a/build/appveyor/build-zlib.bat
+++ b/build/appveyor/build-zlib.bat
@@ -25,7 +25,7 @@
 SET FURL=http://zlib.net/fossils/%URLFILE%
 
 :: Download - support running a local build or a build in appveyor
-CD "%WIN3P%"                                                     || EXIT /B
+CD "%WIN3P%" || EXIT /B
 IF "%APPVEYOR_BUILD_ID%" == "" (
     curl -L -f -o "%URLFILE%" "%URL%"
     IF ERRORLEVEL 1 (
@@ -34,23 +34,23 @@
 ) ELSE (
     appveyor DownloadFile "%URL%"
     IF ERRORLEVEL 1 (
-        appveyor DownloadFile "%FURL%"                           || EXIT /B
+        appveyor DownloadFile "%FURL%" || EXIT /B
     )
 )
-7z x "%URLFILE%" -so | 7z x -si -ttar > nul                      || EXIT /B
+7z x "%URLFILE%" -so | 7z x -si -ttar > nul || EXIT /B
 
 :: Generate
-MKDIR "%BUILDDIR%"                                               || EXIT /B
-CD "%BUILDDIR%"                                                  || EXIT /B
+MKDIR "%BUILDDIR%" || EXIT /B
+CD "%BUILDDIR%" || EXIT /B
 cmake "%SRCDIR%" ^
       -G"NMake Makefiles" ^
       -DCMAKE_INSTALL_PREFIX="%INSTDIR%" ^
-      -DCMAKE_BUILD_TYPE="%CONFIGURATION%"                       || EXIT /B
+      -DCMAKE_BUILD_TYPE="%CONFIGURATION%" || EXIT /B
 
 :: Build
-nmake /fMakefile install                                         || EXIT /B
+nmake /fMakefile install || EXIT /B
 IF "%CONFIGURATION%" == "Debug" (
-    COPY "%BUILDDIR%\zlibd.pdb" "%INSTDIR%\bin\"                 || EXIT /B
+    COPY "%BUILDDIR%\zlibd.pdb" "%INSTDIR%\bin\" || EXIT /B
 )
 
 ENDLOCAL
diff --git a/build/appveyor/cl_setenv.bat b/build/appveyor/cl_setenv.bat
index 98931a6..40cfc73 100644
--- a/build/appveyor/cl_setenv.bat
+++ b/build/appveyor/cl_setenv.bat
@@ -21,7 +21,7 @@
 ) ELSE IF "%PROFILE%" == "MSVC2015" (
   CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
 ) ELSE IF "%PROFILE%" == "MSVC2017" (
-  CALL :SETUPNEWERMSVC    || EXIT /B
+  CALL :SETUPNEWERMSVC || EXIT /B
 ) ELSE IF "%PROFILE%" == "MINGW" (
   REM Supported, nothing special to do here.
 ) ELSE IF "%PROFILE%" == "CYGWIN" (
@@ -31,8 +31,8 @@
   EXIT /B 1
 )
 
-CALL cl_setcompiler.bat   || EXIT /B
-CALL cl_setgenerator.bat  || EXIT /B
+CALL cl_setcompiler.bat || EXIT /B
+CALL cl_setgenerator.bat || EXIT /B
 
 SET APPVEYOR_SCRIPTS=%APPVEYOR_BUILD_FOLDER%\build\appveyor
 SET BUILDDIR=%APPVEYOR_BUILD_FOLDER%\..\build\%PROFILE%\%PLATFORM%
diff --git a/build/appveyor/simulate-appveyor.bat b/build/appveyor/simulate-appveyor.bat
index 8674f40..6af0aa6 100644
--- a/build/appveyor/simulate-appveyor.bat
+++ b/build/appveyor/simulate-appveyor.bat
@@ -30,6 +30,6 @@
 CD %APPVEYOR_BUILD_FOLDER%
 CALL build\appveyor\%PROFILE:~0,4%-appveyor-install.bat || EXIT /B
 CD %APPVEYOR_BUILD_FOLDER%
-CALL build\appveyor\%PROFILE:~0,4%-appveyor-build.bat   || EXIT /B
+CALL build\appveyor\%PROFILE:~0,4%-appveyor-build.bat || EXIT /B
 CD %APPVEYOR_BUILD_FOLDER%
 CALL build\appveyor\%PROFILE:~0,4%-appveyor-test.bat