Applied code changes to fresh clone.

When I run the test with a debugger (or simply look for the debug statement here "Matched mixin type"), this block is not being executed... which is one of the main reasons for this PR.