diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5f16d27c..249330d9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -38,8 +38,6 @@ jobs:
       ninja -C build
     displayName: 'Build'
 
-# TODO should it be "etc.bat" amd64 or "etc.bat amd64"?
-
 # vs2015 {
 
 - job: windows_386_msvc2015_shared_ninja
@@ -54,11 +52,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=shared --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
       ninja -C build
     displayName: 'Build'
 
@@ -74,11 +72,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=static --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
       ninja -C build
     displayName: 'Build'
 
@@ -91,7 +89,7 @@ jobs:
   steps:
   - template: azure-pipelines/vs2015-install-latest-python3-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=shared --backend=vs2015
     displayName: 'Configure'
   - task: MSBuild@1
@@ -109,7 +107,7 @@ jobs:
   steps:
   - template: azure-pipelines/vs2015-install-latest-python3-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=static --backend=vs2015
     displayName: 'Configure'
   - task: MSBuild@1
@@ -130,11 +128,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=shared --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
       ninja -C build
     displayName: 'Build'
 
@@ -150,11 +148,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=static --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
       ninja -C build
     displayName: 'Build'
 
@@ -167,7 +165,7 @@ jobs:
   steps:
   - template: azure-pipelines/vs2015-install-latest-python3-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=shared --backend=vs2015
     displayName: 'Configure'
   - task: MSBuild@1
@@ -185,7 +183,7 @@ jobs:
   steps:
   - template: azure-pipelines/vs2015-install-latest-python3-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=static --backend=vs2015
     displayName: 'Configure'
   - task: MSBuild@1
@@ -208,11 +206,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=shared --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
       ninja -C build
     displayName: 'Build'
 
@@ -228,11 +226,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=static --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
       ninja -C build
     displayName: 'Build'
 
@@ -245,7 +243,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=shared --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1
@@ -263,7 +261,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
       meson setup build --buildtype=release --default-library=static --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1
@@ -284,11 +282,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=shared --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
       ninja -C build
     displayName: 'Build'
 
@@ -304,11 +302,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=static --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
       ninja -C build
     displayName: 'Build'
 
@@ -321,7 +319,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=shared --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1
@@ -339,7 +337,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
       meson setup build --buildtype=release --default-library=static --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1
diff --git a/azure-pipelines/vs2015-install-latest-python3-meson.yml b/azure-pipelines/vs2015-install-latest-python3-meson.yml
index 71236c4f..06106cfc 100644
--- a/azure-pipelines/vs2015-install-latest-python3-meson.yml
+++ b/azure-pipelines/vs2015-install-latest-python3-meson.yml
@@ -12,10 +12,3 @@ steps:
     python -m pip install --upgrade pip setuptools wheel
     pip install meson
   displayName: 'Install Latest Meson'
-- script: |
-    dir "C:\Program Files\"
-    dir "C:\Program Files (x86)\"
-    dir "C:\Program Files (x86)\Microsoft Visual Studio 14.0\"
-    dir "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\"
-    dir "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\"
-    exit 1