added override of expand/contract-only class option for internal calls