Move addInstr to use new instr.computeScopeFlags.  Fix bug involving keyword args flag I made 2 checkins ago