Updated for C++ positions.