Session header edits from Gabriel M.  Related cleanup.