[Validator] Fix hack for nested Collection/All losing context