Refactor transcendental solver (#5539)