UNDERTOW-276 Fix bug in HeaderValues and simplify the code