anchor.diff:      ].
   
   partition_count_usage() ->
  -   Text = [
  -            "riak-admin cluster partition-count [--node node]\n\n",
  +   Text = ["riak-admin cluster partition-count [--node node]\n\n",
               "Returns the number of partitions (ring-size) for the entire\n",
  -            "cluster or the number of partitions on a specific node."
  -    ],
  -    [
  -     ["riak-admin", "cluster", "partition-count"],
  -     Text
  -    ].
  +            "cluster or the number of partitions on a specific node."],
  +    [["riak-admin", "cluster", "partition-count"], Text].
   
   partition_count([], [{node, Node}]) ->
       {ok, Ring} = riak_core_ring_manager:get_my_ring(),
       Indices = riak_core_ring:indices(Ring, Node),
       Row = [[{node, Node}, {partitions, length(Indices)}, {pct, claim_percent(Ring, Node)}]],
  -    Table = [riak_cli_status:table(Row)],
  -    riak_cli:print(Table);
  +    [riak_cli_status:table(Row)];
   partition_count([], []) ->
       {ok, Ring} = riak_core_ring_manager:get_my_ring(),
  -    T = riak_cli_status:text(
  +    [riak_cli_status:text(
            io_lib:format("Cluster-wide partition-count: ~p", 
  -                       [riak_core_ring:num_partitions(Ring)])),
  -    riak_cli:print([T]).
  +                       [riak_core_ring:num_partitions(Ring)]))].
   
   %%%
   %% cluster partitions
   %%%
   
   partitions_register() ->
  -    [
  -     ["riak-admin", "cluster", "partitions"],      % Cmd
  +    [["riak-admin", "cluster", "partitions"],      % Cmd
        [],                                           % KeySpecs
        [{node, [{shortname, "n"}, {longname, "node"},
                 {typecast, fun list_to_atom/1}]}],   % FlagSpecs
  -     fun partitions/2                              % Implementation callback
  -    ].
  +     fun partitions/2].                            % Implementation callback
   
   
   partitions_usage() ->
  -   Text = [
  -            "riak-admin cluster partitions [--node node]\n\n",
  -            "Returns the partitions which belong to the current node,\n",
  -            "or to a specific node."
  -    ],
  -    [
  -     ["riak-admin", "cluster", "partitions"],
  -     Text
  -    ].
  +   Text = ["riak-admin cluster partitions [--node node]\n\n",
  +           "Returns the partitions which belong to the current node,\n",
  +           "or to a specific node."],
  +    [["riak-admin", "cluster", "partitions"], Text].
   
   partitions([], [{node, Node}]) ->
       partitions_output(Node);
  
positive.code:     T1 = riak_cli_status:text(io_lib:format("Ring ready: ~p~n", [element(2, RingStatus)])),
      T2 = riak_cli_status:text(
             "Key: (C) = Claimant; availability marked with '!' is unexpected"),
      Out = riak_cli_status:alert([T0,T1,Table,T2]),
      riak_cli:print([Out]).
  
  format_status(Node, Status, Ring, RingStatus) ->
      {Claimant, _RingReady, Down, MarkedDown, Changes} = RingStatus,
  
negative.code:            ++ generate_rows(RingSize, secondary, Secondary)
             ++ generate_rows(RingSize, stopped, Stopped),
      Table = riak_cli_status:table(Rows),
      [riak_cli_status:alert([T0, Table])].
  
  generate_rows(_RingSize, Type, []) ->
      [[{type, Type}, {index, "--"}, {id, "--"}]];
  