Minor cleanups to OpenID Connect integration.