Support for more comprehensive harvesting mode vs binary safe-mode.

https://bugs.launchpad.net/juju-core/+bug/1345553
https://code.google.com/p/go-wiki/wiki/CodeReviewComments#Variable_Names

I can be persuaded :)