= can: preserve order of headers during parse + minor cleanups, closes #961