Cleaned up Solaris selector