I haven't looked at 3.0's code so I couldn't say for sure but I know you know your stuff Dave so I'm sure it's all good.
Yeah the extra overhead should only occur during calendar viewing. The last time I seen it running here I recall a good 30-40 queries being needed when there was a few events listed. Is there a way to cut them down? Just a thought.