Re-written combo box list helpers in a more object-oriented manner.