8199791: (se) More Selector cleanup

Reviewed-by: redestad, bpb
33 files changed