Make x:lines play better with s2s