Don't think we need to include the delete as it's a button... but perhaps we should just make this explicit to what should be included since there are so many exceptions now.  I can do it in a follow up bug fix after this is posted.