Performance tweak in allOf