Fix SA1203/S109

[baranyaimate]

The issue or feature being addressed

Contributes to #1290

Details on the issue fix or feature implementation

Fix SA1203 and S109.

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 (2d5e364) 85.90% compared to head (b4c397b) 85.91%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1948      +/-   ##
==========================================
+ Coverage   85.90%   85.91%   +0.01%     
==========================================
  Files         312      312              
  Lines        6647     6654       +7     
  Branches     1057     1057              
==========================================
+ Hits         5710     5717       +7     
  Misses        540      540              
  Partials      397      397              

Flag	Coverage Δ
linux	85.91% <100.00%> (+0.01%)	⬆️
macos	85.91% <100.00%> (+0.01%)	⬆️
windows	85.91% <100.00%> (+0.01%)	⬆️

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.