macro-syntax improvement