Minor clean-ups in the selection service.

Small things I noticed while using it.