Some more refactoring.  Work on adding ellipses to long session fields.