Merge changes Ibbf7f77c,I7e80c13f,I4eeeea28

* changes:
  Some cleanup (3/n)
  Move some fields/methods into StagedSession (2/n)
  Extract staged session code to a separate class (1/n)