Refactoring to prepare for #186 - removing guards logic from MixinsSolver