Update cpp-common (properly this time)