#465: Refactoring choice validator