Bring in the improved internal API for the CLI.