Actually, we can't count on `help-buffer-under-preparation' being non-nil in `describe-*' commands (unless we're willing to modify all the ones in which it isn't, which sounds rather dubious). Patch updated.