Update combine_highlight helper to not accidentally return nil values.