Clean up from rsync+ patch; fix compiler warning.