Clean up the CC version check a bit.

Apologies for not having included this in the last pull request.