Hide members of collapsed families properly in graph view.

Also renamed some misleadingly-named variables that dated back to before we had collapsible families.

Addresses #558.

@dpmatthews, please review.  Test battery passes.

@benfitzpatrick - I see you were assigned to this, apologies if you had done any work on it already. I got on to this via #538.