Merge branch 'jc/xwrite-cleanup'