Make conditional less wordy

Per Maciek Sakrejda's review.
Strengthen consistency check in test

Maciek Sakrejda accurately points out that un-uploaded segments ought
to never be marked as done in his review.