Rework LeafRefValidation