correct when_values BNF in comment.