Yes, its that "disc". I always considered the disc on top of the CPU as the heat sink and on my 3 Wallstreets there is no heat/thermal compound goo or anything else on it or the CPU. Where that disc is pressed against the CPU it is polished to promote the heat transfer to its maximum level. (That is why I consider it as the heat sink.)
The metal plate that is part of the em-shield under the keyboard that you refer to as the heat sink, I see that there is some kind of thermal/insulating tape there. I see now that it it part of the heat dissipating mechanism; similar to old CB Radios where the final amplifying transistors are on a heat sink and then the heat sinks up against the radio chassis. In those cases, the radio chassis is not considered as the heat sink but as electronic ground. It draws away the heat from the finals was a secondary function being exploited. This design is also in the LC and IIcx/ci Power Supplies, where there are power transistors/regulators in the middle of the board tied to a heat sink and then that heat sink tied the PSU's case. The PSU casing is not the heat sink but it being taken advantaged of as such for this process.
In both cases there is some kind of heat/thermal compound goo on the heat sink and the chassis/psu casing. So I also believe this piece on the Wallstreet is doing the same thing - doing one job of EM shielding while at the same time being taken advantage of for drawing away heat. In the past in testing, I have ran the Wallstreet (a 233MHz) for three hours as a test without the shielding but with just the heat sink disc without ill effect on the system.
) but it is not exactly integrated, just more slapped on IMO.