Patch by Michael Hudson: when the object of attribute expansion is a

class instance, include the class attributes in the list of possible
expansions.