Move provide comment out of help block.

It was showing up in help information. Moving it elsewhere fixes this and allows
it to still provide completions.
Merge branches 'master' and 'develop'