My prior comment may not have been 100% correct. I believe the specific research that lead to the so called 4% rule did include a mix of stocks and bonds. As you point out, you would tend to roll back your risk tolerance as you reach retirement. Here's more on it for anyone interested:

http://blog.cordantwealth.com/how-much-can-i-spend-in-retire...?