QUIC - minor cleanup changes to keep code in sync with the internal