Counterfactual scenarios: remove shocks from historical decomposition

[jpfeifer]

Please do no cross-post. See my reply at Counterfactual scenarios