Deprecate 'set -e' in favor of explicit returns.

Add more explicit returns.