we weren't recursing in expand_single...