Swith to new-style session settings

Even more abstraction...