Fix issue with empty macro args