BTW, we should use `bound-and-true-p` instead of `boundp` here.  It is defined at least in Emacs 23.1.