Show comments on simple addresses

Also fix bug -- we were using the deprecated description attribute on
contacts.