Added missing clauses of expansion_commands_term and substitute_term_into to handle brace_term_position