[FIXED JENKINS-21113] Enforce subitem restrictions better.