This PR is for the master branch of this plugin, and I've got other unrelated changes in my local master. I'd like to sneak the comments mentioned above into the next PR, which is where everything was changed from "Custom" to "Ad Hoc".

I already have the new comments added to my working copy. But it's going to be a major PITA to commit them to this PR.