Be more explicit about function signature of toolbar callback

This is not a big change, but it the function signature is more readable this way.