Changes from feedback.

Uess the proper entity.
Adds a comment clarifying intent.