Simplified by moving "container" validators into "compound".