Clarify recursive expand/collapse command names
Consolidate recursive expand/collapse into existing methods