2 files changed, 36 insertions, 43 deletions

diff --git a/main.cc b/main.cc
index da705d29..a25a525a 100644
--- a/main.cc
+++ b/main.cc
@@ -524,7 +524,7 @@ int main(int argc, char * argv[])
       if (! show_empty)
 	display_predicate = "T";
 
-      if (! show_expanded) {
+      if (! show_expanded && predicate.empty()) {
 	if (! display_predicate.empty())
 	  display_predicate += "&";
 	display_predicate += "!n";
@@ -602,8 +602,13 @@ int main(int argc, char * argv[])
 
     format_account acct_formatter(std::cout, format, display_predicate);
 
-    walk_accounts(journal->master, acct_formatter, show_subtotals,
-		  sort_order.get());
+    if (show_subtotals)
+      sum_accounts(journal->master);
+
+    if (sort_order.get())
+      walk_accounts(journal->master, acct_formatter, sort_order.get());
+    else
+      walk_accounts(journal->master, acct_formatter);
 
     if (format_account::disp_subaccounts_p(journal->master)) {
       std::string end_format = "--------------------\n";
@@ -617,7 +622,12 @@ int main(int argc, char * argv[])
 
     format_equity acct_formatter(std::cout, format, nformat,
 				 display_predicate);
-    walk_accounts(journal->master, acct_formatter, true, sort_order.get());
+    sum_accounts(journal->master);
+
+    if (sort_order.get())
+      walk_accounts(journal->master, acct_formatter, sort_order.get());
+    else
+      walk_accounts(journal->master, acct_formatter);
   }
   else if (command == "e") {
     format_transactions formatter(std::cout, format, nformat);
diff --git a/walk.h b/walk.h
index 862ffde0..c29e5f6d 100644
--- a/walk.h
+++ b/walk.h
@@ -472,10 +472,21 @@ class balance_accounts : public item_handler<account_t>
 
 #endif
 
-inline void sort_accounts(account_t *	  account,
-			  accounts_deque& accounts,
-			  const value_expr_t *  sort_order)
-{
+//////////////////////////////////////////////////////////////////////
+
+inline void sum_accounts(account_t * account) {
+  for (accounts_map::iterator i = account->accounts.begin();
+       i != account->accounts.end();
+       i++) {
+    sum_accounts((*i).second);
+    account->total += (*i).second->total;
+  }
+  account->total += account->value;
+}
+
+inline void sort_accounts(account_t *	       account,
+			  accounts_deque&      accounts,
+			  const value_expr_t * sort_order) {
   for (accounts_map::iterator i = account->accounts.begin();
        i != account->accounts.end();
        i++)
@@ -485,55 +496,27 @@ inline void sort_accounts(account_t *	  account,
 		   compare_items<account_t>(sort_order));
 }
 
-inline void walk__accounts_sorted(account_t * account,
-				  item_handler<account_t>& handler,
-				  const value_expr_t * sort_order)
-{
+inline void walk_accounts(account_t *		   account,
+			  item_handler<account_t>& handler,
+			  const value_expr_t *     sort_order) {
   handler(account);
 
   accounts_deque accounts;
   sort_accounts(account, accounts, sort_order);
-
   for (accounts_deque::const_iterator i = accounts.begin();
        i != accounts.end();
        i++)
-    walk__accounts_sorted(*i, handler, sort_order);
+    walk_accounts(*i, handler, sort_order);
 }
 
-inline void sum__accounts(account_t * account)
-{
-  for (accounts_map::iterator i = account->accounts.begin();
-       i != account->accounts.end();
-       i++) {
-    sum__accounts((*i).second);
-    account->total += (*i).second->total;
-  }
-  account->total += account->value;
-}
-
-inline void walk__accounts(account_t * account,
-			   item_handler<account_t>& handler)
-{
+inline void walk_accounts(account_t * account,
+			  item_handler<account_t>& handler) {
   handler(account);
 
   for (accounts_map::const_iterator i = account->accounts.begin();
        i != account->accounts.end();
        i++)
-    walk__accounts((*i).second, handler);
-}
-
-inline void walk_accounts(account_t *		       account,
-			  item_handler<account_t>&     handler,
-			  const bool		       calc_subtotals,
-			  const value_expr_t *         sort_order = NULL)
-{
-  if (calc_subtotals)
-    sum__accounts(account);
-
-  if (sort_order)
-    walk__accounts_sorted(account, handler, sort_order);
-  else
-    walk__accounts(account, handler);
+    walk_accounts((*i).second, handler);
 }
 
 } // namespace ledger