teasers showing up with full view content

I am using contemplate 1.6 (current CVS download) as an upgrade from 1.5, which did not solve a problem I'm having. The template seems to be ignored. Nodes are showing up on my front page with the full view. I even created a view with a page providing a "teaser list" to make double sure. If I look at the node structure I can see that the teaser is filled in properly. I put "Teaser:" at the beginning of my teaser template and "Body:" at the beginning of my body template to make sure that contemplate is actually doing something. It is...

Here are my templates:

Teaser:

Teaser: <?php print $teaser ?>

Body:

Body: <?php foreach ((array)$field_game_text as $item) { ?>
  <div class="field-item"><?php print $item['view'] ?></div>
<?php } ?>

So I go to my teaser view page and I see "Teaser:" at the top of the text like I expect. But then I see this code:

<div class="content">Teaser: <div class="field field-type-text field-field-game-text"><h3 class="field-label">Game Text</h3><div class="field-items"><div class="field-item">

Which is followed immediately by the content. This is the content that should be displayed only if contemplate is not involved. So what appears to be happening here is that the $teaser value in the template is being replaced with the $content somehow? Again, if I go look at the node structure, the teaser IS properly set in the node.

This must be a problem with either cck.module or contemplate.module botching the value of $teaser before contemplate can print it, but I don't know which, so I came here. I hope that I'm not trying to actually report a problem with cck, but I can't tell which is the problem.

I just updated cck after updating contemplate didn't solve the problem, and of course that didn't solve it either, or I wouldn't be here...