Making the list terminator incorporate the label instead of just the separator.

@bmmoore please review.