Avoid breaking out into a different shell

Not all that important but I think this makes for cleaner (and maybe less brittle) code.