More refactorings of OAuth 1.0 code