How to make Safari 4 open tabs at startup

I decided to give Safari 4 a try and the inability to set it to open the last set of tabs at start up is driving me crazy. I found a solution that, although not ideal, works well enough to get me by until Chrome comes out for Mac. Its an easy enough solution:

1. Create a new bookmark folder
2. Add the tabs you want to be opened to this folder and order them
3. Goto preferences and set "new windows open with:" to your startup tabs folder

Now when Safari starts it will load those tabs. Unfortunately, these tabs will also load when you open a new window. And if you happen to have a tab open that you wanted to keep and you close the app its gone. You can go to "History->Reopen all windows from last session" in desperate situations. This isn't as nice as just remembering the tabs that were open (like every other modern browser), but its passable.