Some OIDC RP refactoring