Mild refactoring. Prep for Session.