Hm.... this is a bit of a hack, but I suppose as long as it works it is a good way not to duplicate expansion formulas. But it certainly means you have to add some more tests (for more complicated arguments), to make sure both that the expression comes out in the form you think it should; and to make sure it works numerically.