improved multiple `default()` guards conflict detection, updated tests.
Merge pull request #1823 from seven-phases-max/mixin-guard-default-2

Improved multiple `default()` guards conflict detection.