[3282] Addressed review comments.

Most notable change is the removeal of the remove-on-renew
configuration parameter.  Other changes were to commentary
or minor code improvements.