fix two more merge problems

Author: mscuthbert

music21/stream/base.py

@@ -6727,7 +6727,7 @@ def makeNotation(self: StreamType,
             makeNotation.splitElementsToCompleteTuplets(m, recurse=True, addTies=True)
             makeNotation.consolidateCompletedTuplets(m, recurse=True, onlyIfTied=True)
 
-        if not measureStream.streamStatus.beams:
+        if not returnStream.streamStatus.beams:
             try:
                 makeNotation.makeBeams(returnStream, inPlace=True)
             except meter.MeterException as me:

music21/stream/makeNotation.py

@@ -1891,7 +1891,7 @@ def splitElementsToCompleteTuplets(
     >>> [el.quarterLength for el in p.recurse().notesAndRests]
     [Fraction(1, 6), Fraction(1, 3), Fraction(1, 3), Fraction(1, 6)]
     '''
-    iterator: t.Iterable[Stream]
+    iterator: t.Iterable['music21.stream.Stream']
     if recurse:
         iterator = s.recurse(streamsOnly=True, includeSelf=True)
     else: