For historical reference, Ulf has pointed out that I misunderstood what was going on here, and this diff is incorrect.
There is a much more elegant way of handling this with xorg.conf that he pointed out using separate InputClasses with MatchIsTouchPad and MatchIsPointer options. Thanks Ulf, and thanks jcs@ for getting me started.
