Cleanups on recent xpsave commit