of source code.

This is substantially DocWilcos fix, but instead of adding yet another
unique numbering variable, I have collapsed the once we have into
a single one.

Fixes #948