Add handling for some well-known class refs