Fix #1541, Combine consecutive mutually exclusive #ifs

[thnkslprpt]

Checklist

• I reviewed the Contributing Guide.
• I signed and emailed the appropriate Contributor License Agreement to [email protected] and copied [email protected].

Describe the contribution
Fixes #1541
Combines 2 (identical) cases of immediately consecutive, mutually exclusive #if/#endif blocks into a single #if/#else/#endif.

Testing performed
GitHub CI actions (incl. Build + Run, Unit Tests etc.) all passing successfully.

Expected behavior changes
No impact on behavior - logical flow is essentially unchanged.

Contributor Info
Avi Weiss @thnkslprpt

[dzbaker]

CCB 3 November 2022: Want to take approach of making these runtime options (rather than being conditionally compiled). Will likely require some refactoring to time.