Fix to funny expression handlers appearing in main toolbar.