Retyped C++ typed correctly and buildable