Various commits to enable no-shell or safe-shell usage, more to come.