Some more with statements

The first of these is a backport from scikit-learn and is needed for Py3 compat. The rest are mainly cosmetic right now.