Partially refactor hydrate to new interface
Make parse always emit the info header