Agreed.  These are now pretty independent cases, better to separate and duplicate the two lines at the bottom