Have `cinch_plugin` be the suffix again.
Remove unnecessary comments.