Keep one canonical path for the physics.
The aircraft simulator reuses the same aircraft derivative across integration, trim, and the adverse-yaw study. Keeping one computational path helps analysis stay aligned with the simulation being investigated.