update macros to use xspace