Thanks for the push in the right direction.
It seems that:
$post = $wp_query->post;
is no longer needed in 2.5. If you use in_category() outside of the loop it query’s the post anyway. Is there anyway to get confirmation on this? Maybe I should use it the way it is documented just in case a change in future releases?