Python: Fix semantic merge conflict between #1206 and #1240.

Author: markshannon

python/ql/test/library-tests/taint/general/TestDefn.expected

@@ -174,10 +174,9 @@
 | test.py:186 | ArgumentRefinement(t_3) | test.py:178 | Taint simple.test | SOURCE |
 | test.py:189 | FALSEY | test.py:189 | Taint falsey | FALSEY |
 | test.py:191 | Pi(t_0) [true] | test.py:189 | Taint falsey | FALSEY |
-| test.py:194 | phi(t_3, t_5) | test.py:195 | Taint simple.test | SOURCE |
+| test.py:194 | phi(t_2, t_4) | test.py:195 | Taint simple.test | SOURCE |
 | test.py:195 | SOURCE | test.py:195 | Taint simple.test | SOURCE |
-| test.py:196 | ArgumentRefinement(t_0) | test.py:195 | Taint simple.test | SOURCE |
-| test.py:197 | ArgumentRefinement(t_2) | test.py:195 | Taint simple.test | SOURCE |
-| test.py:197 | Pi(t_1) [true] | test.py:195 | Taint simple.test | SOURCE |
-| test.py:199 | ArgumentRefinement(t_4) | test.py:195 | Taint simple.test | SOURCE |
-| test.py:199 | Pi(t_1) [false] | test.py:195 | Taint simple.test | SOURCE |
+| test.py:197 | ArgumentRefinement(t_1) | test.py:195 | Taint simple.test | SOURCE |
+| test.py:197 | Pi(t_0) [true] | test.py:195 | Taint simple.test | SOURCE |
+| test.py:199 | ArgumentRefinement(t_3) | test.py:195 | Taint simple.test | SOURCE |
+| test.py:199 | Pi(t_0) [false] | test.py:195 | Taint simple.test | SOURCE |

python/ql/test/library-tests/taint/general/TestVar.expected

@@ -176,10 +176,9 @@
 | test.py:186 | t_4 | test.py:178 | Taint simple.test | SOURCE |
 | test.py:189 | t_0 | test.py:189 | Taint falsey | FALSEY |
 | test.py:191 | t_1 | test.py:189 | Taint falsey | FALSEY |
-| test.py:194 | t_6 | test.py:195 | Taint simple.test | SOURCE |
+| test.py:194 | t_5 | test.py:195 | Taint simple.test | SOURCE |
 | test.py:195 | t_0 | test.py:195 | Taint simple.test | SOURCE |
-| test.py:196 | t_1 | test.py:195 | Taint simple.test | SOURCE |
+| test.py:197 | t_1 | test.py:195 | Taint simple.test | SOURCE |
 | test.py:197 | t_2 | test.py:195 | Taint simple.test | SOURCE |
-| test.py:197 | t_3 | test.py:195 | Taint simple.test | SOURCE |
+| test.py:199 | t_3 | test.py:195 | Taint simple.test | SOURCE |
 | test.py:199 | t_4 | test.py:195 | Taint simple.test | SOURCE |
-| test.py:199 | t_5 | test.py:195 | Taint simple.test | SOURCE |