Empty namespace issue is now much less intrusive.