NameFactory lost --source-id-of check; big bug.