Minor rejig, to support more wsgi stuff