Removed a cyclic dependency in the CLI code.
9 files changed