Resolve the conflicts with the merged nested ifs (#194) in control_tractive_force() and control_braking_force(): the conditions keep the new flattened form, with this branch's changes carried into them.