Follow up to r1894937: Fix setting of empty value. And simplify parsing states (useless HDR_NEXTLINE).