Small update to add some debouncing.

Actually, perhaps this should be moved to a new bug. I can go ahead and
do that in a few days/weeks if no one's said anything by then. Thanks.