Slight refactor of fakeweb support code.