This issue is fixed by adding "addExtI_shift" pattern rule. Other similar rules are also added. Reviewed-by: aph, adinn