Switch to Session object, for #113.