Button debouncing tweaks

Tweaked the button debouncing code to match daafisch's suggestions to my
previous code.