Fix scope entry detection
Add CxxNamespaceDeclarationToken