I just noticed that the Shipping Address section of the customer invoice looks a bit odd when it is prepared for a non-shippable item. It shows up like this:
Shipping Address:
, NY 10007
(checked it on the livetest too).
Is there an easy way to disable the shipping address output, but only when the order is made up of non-shippable items? It's done with a Token right now, which makes it all or nothing...
Thanks.

