Namespace fixes, docblock tweak.