Avoiding macro redefinitions