Merged renegotiation refactoring