Fix recent xsession changes.