Got all of the link indices in the same blocks they are in for both the C and C++ versions