C/CC: skip earlier in should_save, add CC-specific deps

breaks a few more core tests, but CC is now really slim