Small cleanup to netty code, no functional changes.