Added ssexpand and infix_expand