[contact] Assorted small improvements.