Fix a bug: don't double-advance through labels.  And fix the text in a
comment.