Minor tweak to encounters in CCDA generation.

This was left out of that last, big rebased commit
by accident, but since the branch is pushed remotely
now, it gets its own commit.