Fixed various errors and style issues prompted by #3249

[jajhall]

Description

Quote ordering was fixed by #3162 but second observation led to several errors and style issues being fixed

Checklist

• I have read the contributing guidelines
• This PR targets the latest branch
• Tests are passing
• Documentation was updated where relevant
• This PR is not primarily AI-generated (per the AI contributions policy in CONTRIBUTING.md)

Related issue

Closes #3249

[jajhall]

@filikat I've checked the aesthetics when HiPO is unavailable - by frigging the boolean hipo_available, which I feel makes the code much more readable!

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 73.25%. Comparing base (bf989e9) to head (3a1fd97).
⚠️ Report is 22 commits behind head on latest.

Additional details and impacted files

@@            Coverage Diff             @@
##           latest    #3252      +/-   ##
==========================================
+ Coverage   73.24%   73.25%   +0.01%     
==========================================
  Files         445      445              
  Lines      108105   108185      +80     
  Branches    17328    17344      +16     
==========================================
+ Hits        79180    79256      +76     
- Misses      28649    28653       +4     
  Partials      276      276              

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.