These changes should avoid some cases where up-to-date binaries were deleted based on the cruft report.