Relax more classes for Minion zones.

Reorganize changes to clearly document why parts are needed.