Make everyone our friend.

Improve selector builder.