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

https://bugs.launchpad.net/juju-core/+bug/1345553
Don't we also need to do this for All() as well?