Fix for #933 issue

This PR fixes #933, and some minor glitches detailed in the commit messages.
We're effectively using the class in the code.

If there's no formal convention, I prefer using the namespace this way, so that we can see which class are used by looking at the use clauses, whthout the need to dig into the code.