Changes to reflect updates in Netty upstream.