Minor clean up to the CPP runtime codebase