More cleanup of http parser