Merge "Don't create anonymous namespace"