Clarifying distinction between ClassItem and TypeItem
am: 85cafb804f

Change-Id: I1ed30da0a0b1614ab3ae766bdb1b7522afcb48f9