Don't these lose the `modules/cpp-common/` bit now we've upgraded?