added do /while to multi-line macros