r21845: Refactor the sessionsetupX code a little to allow us