Yes, that is the direction things are going in. The remaining thermal power technology that's still (for the moment) viable is combustion turbines, which are internally heated (combined cycle does have an externally heated bottoming cycle, but only 1/3 the power output goes through that, and it shares the generator with the combustion turbine proper.) But even combustion turbine sales are falling; that's what's gotten General Electric in such trouble lately.