This commit essentially brings back old code. We did an attempt to
resolve doxy issues with nfc durint docathlon, but it introduced more
issues and yak shaving rather than being a useful exercise.
Unfortunately the previous attempt got merged. This commit attempts to
restore the style maintained by original developers. From here they can
take over.