Clean up the CC version check a bit.