Simplify the previous commit because commit callback for buttons is now
identical to the clicked callback, obviating the need to distinguish between
these control types.