Better handling of combo-rule endings