Now handles startup arguments with spaces.