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

@bmmoore please review.
this doesn't feel like a good api to me. Stuff specific to user lists should be on the UserList class.