Issue #1847198 by benjifisher, jessebeach, effulgentsia: Update the structure returned by hook_toolbar().