Reconciling energy efficiency and energy intensity metrics: an integrated decomposition analysis