Code refactor for Google OpenID.