Verify functionality after bulk link fixes

[rolker]

Carefully compare the C++ implementation agains the reference code to see if it still seems to be doing what it should.
Also, evaluate testing to see if we can improve it.