First cut of renegotiation extension. (port to HEAD)