Fix for #933 issue

This PR fixes #933, and some minor glitches detailed in the commit messages.
Comments are not usage. If you don't cast a parameter with the classname, just write the full NS in the comment :)