Cleanup NamespaceStorageSupport/StmtContext API conflict