I think Caleb has had some very funny lines. It's just a different kind of humor to the usual.
I thought it was funny when the first said it was embarassing as he was 'fighting' Buff. They sort of bounce off one another, dialogue-wise, extremely well.
The only thing that concerns me is you guys thinking he'll not be a problem.
HELLO? It's the final Buffy episodes ever! They may well KILL Buffy even though she has the axe that Fray uses in the comic. Don't forget Faith is the rightful slayer. I guess we'll find out tonight if she survives that bomb. And there aint no resurrecting going on. Willow saw to that when the urn was broken in Bargaining.
Gosh, the suspense is absolutely killing me!!!