[EpgSelection] more cleanup, and slight speed ups.