Move things around slightly so the compiler can track cc
2 files changed