Changes required to match upstream Netty.