Fix all macro arguments (need * and **)