Revert "[listboxservice] Streamline some code - just cosmetic"

This reverts commit a243816110ff62035eac9d29d830ed977c93ef6d.