Remove more bashisms