Removed NameScope hack.