Slight code cleanup for handling finished labels.
6 files changed