Optimized whitelist jugglery.
Merge pull request #1713 from ADmad/2.5-modelvalidator-optimize

Optimized whitelist jugglery.