Adjusting to minor changes in NamespaceContext.