These are all moved over with the session abstraction PR, correct? If so, I'm fine with them here for now.