Marcelo
	Poking around w/ the tsc-disable patch, I figured I should send out
this trivial cleanup as well. I got these changes from a post Brian
Gerst originally released for 2.5.

thanks
-john