 In your macro, I think you want to end with \xspace
In your macro, I think you want to end with \xspace