QUIC - Cleanup changes found while sync'ing with internal code.