QUIC - minor cleanup changes.