One other thing I thought of -- for rides over 40 miles or so in hot weather, I will often bring "individual serve" packets of Gu20. If you have a place to fill your bottles/buy water, they're quite handy and don't take up too much room.