Consistent selector style, as in contract()

Change-Id: I3a14112263e5fd304d7d6e9eb4baf77139eb8637
Merge "Consistent selector style, as in contract()"