Demand Effects in Productivity and Efficiency Analysis