Fix SA1129

[gintsk]

Pull Request

The issue or feature being addressed

Contributes to #1290

Details on the issue fix or feature implementation

Fix SA1129 and further simplify 'default' expression (IDE0034)

Confirm the following

• I started this PR by branching from the head of the default branch
• I have targeted the PR to merge into the default branch
• I have included unit tests for the issue/feature
• I have successfully run a local build

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (29086a3) 85.91% compared to head (51d0635) 85.91%.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1964   +/-   ##
=======================================
  Coverage   85.91%   85.91%           
=======================================
  Files         312      312           
  Lines        6654     6654           
  Branches     1057     1057           
=======================================
  Hits         5717     5717           
  Misses        540      540           
  Partials      397      397           

Flag	Coverage Δ
linux	85.91% <ø> (ø)
macos	85.91% <ø> (ø)
windows	85.91% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.