A bit of house cleaning on the button listeners.