Fix some more namespace qualification issues.