Fix shape annotation additions.
Add missing case for branches in consumedInExp.