Continue refactoring of ShibbolethHttpClient