Adjust argv handling so it is lazier