[OE-5211] removed spurious xdebug call.
[OE-5211] logic for handling alternative combinations of diagnoses in correspondence macros, and associated unit tests.