Slight simplification. The result is the same. Also, change the
wording of the message as requested in patch review.