looking for: query-replace with a "yank-word" binding ala isearch

[bigfaceworm]

All,

I was wondering if anyone had a yank-word binding for query-replace
similar to the C-w binding for isearch-forward.

I tried defining my own, but because the control switches to the 
minibuffer, I'm not sure how to find the buffer in which to do:

    (buffer-substring (point) (progn (forward-word 1) (point)))

any help?


Thank
BFW