CLI rewrite and unification.