Enable CN Namespaces only where Needed

Apparently you can't add namespaces after the Language object
has been initialized. So -- move those calls to later in the
initialization chain and then we can gate the creation of the
namespaces. Whoo!

Change-Id: If44760952a3a31bd3df472d00c007cb0fa1dd0ea
Merge "Enable CN Namespaces only where Needed"