diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index 7e125058..98dba9d6 100755
--- a/admin-tools/setup-master.sh
+++ b/admin-tools/setup-master.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 # Check out master branch and dependent development master branches
-PYTHON_VERSION=3.8
-
 bs=${BASH_SOURCE[0]}
 if [[ $0 == $bs ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
 
-mydir=$(dirname $bs)
+PYTHON_VERSION=3.8
+
 uncompyle6_owd=$(pwd)
+mydir=$(dirname $bs)
+fulldir=$(readlink -f $mydir)
 cd $mydir
 . ./checkout_common.sh
-fulldir=$(readlink -f $mydir)
 cd $fulldir/..
 (cd $fulldir/.. && \
      setup_version python-spark master && \
diff --git a/admin-tools/setup-python-2.4.sh b/admin-tools/setup-python-2.4.sh
index d54125ca..386c6284 100755
--- a/admin-tools/setup-python-2.4.sh
+++ b/admin-tools/setup-python-2.4.sh
@@ -1,32 +1,23 @@
 #!/bin/bash
 # Check out python-2.4-to-2.7 and dependent development branches.
 
-PYTHON_VERSION=2.4.6
-
 bs=${BASH_SOURCE[0]}
 if [[ $0 == $bs ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
 
-function checkout_version {
-    local repo=$1
-    version=${2:-python-2.4-to-2.7}
-    echo Checking out $version on $repo ...
-    (cd ../$repo && git checkout $version && pyenv local $PYTHON_VERSION) && \
-	git pull
-    return $?
-}
-
-owd=$(pwd)
-
-export PATH=$HOME/.pyenv/bin/pyenv:$PATH
+PYTHON_VERSION=2.4.6
 
+uncompyle6_owd=$(pwd)
 mydir=$(dirname $bs)
 fulldir=$(readlink -f $mydir)
-(cd $fulldir/.. && checkout_version python-spark && checkout_version python-xdis python-2.4-to-2.7 &&
-     checkout_version python-uncompyle6)
+cd $mydir
+. ./checkout_common.sh
 
-git pull
-rm -v */.python-version || true
-cd $owd
+(cd $fulldir/.. && \
+     setup_version python-spark python-2.4 && \
+     checkout_version python-xdis python-2.4-to-2.7)
+
+
+checkout_finish python-2.4-to-2.7
diff --git a/admin-tools/setup-python-3.0.sh b/admin-tools/setup-python-3.0.sh
index 38aad269..f5027db8 100644
--- a/admin-tools/setup-python-3.0.sh
+++ b/admin-tools/setup-python-3.0.sh
@@ -1,21 +1,20 @@
 #!/bin/bash
 # Check out python-3.0-to-3.2 and dependent development branches.
-
-PYTHON_VERSION=3.0.1
-
 bs=${BASH_SOURCE[0]}
 if [[ $0 == $bs ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
 
+PYTHON_VERSION=3.0.1
+
+uncompyle6_owd=$(pwd)
 mydir=$(dirname $bs)
-. ./checkout_common.sh
 fulldir=$(readlink -f $mydir)
-cd $fulldir
-cd $fulldir/..
+cd $mydir
+. ./checkout_common.sh
 (cd $fulldir/.. && \
      setup_version python-spark master && \
-     checkout_version python-xdis python-3.0-to-3.2)
+     setup_version python-xdis python-3.0)
 
 checkout_finish python-3.0-to-3.2
diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh
index d78694b9..4d2c27cb 100755
--- a/admin-tools/setup-python-3.3.sh
+++ b/admin-tools/setup-python-3.3.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 # Check out python-3.3-to-3.5 and dependent development branches.
-PYTHON_VERSION=3.3.7
-
 bs=${BASH_SOURCE[0]}
 if [[ $0 == $bs ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
 
+PYTHON_VERSION=3.3.7
+
+uncompyle6_owd=$(pwd)
 mydir=$(dirname $bs)
-. ./checkout_common.sh
 fulldir=$(readlink -f $mydir)
+. ./checkout_common.sh
 cd $fulldir/..
 (cd $fulldir/.. && \
      setup_version python-spark master && \