fix macro handling for plain macro arguments