Bug 942107 - Be smarter about locators in Contacts app

5 more locators bite the dust!