Improve console completer. Adjust DI, root context.