Improved efficiency of EmptyNamespaceIssue again